Reversed previous commits

jasir · Jan 10, 2011 · d4975b2 · d4975b2
1 parent 193201d
commit d4975b2
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 22 deletions.
diff --git a/RequestsPanel.php b/RequestsPanel.php
@@ -52,22 +52,12 @@ public static function register() {
 
 	}
 
-	public static function dump($var, $label = NULL, $depth = NULL) {
-		if ($depth) {
-			$depthSave = Debug::$maxDepth;
-			Debug::$maxDepth = $depth;
-		}
-		$dump = DebugHelpers::clickableDump($var);
+	public static function dump($var, $label = NULL) {
+		$s = DebugHelpers::clickableDump($var);
 		if ($label === NULL) {
-			$label = gettype($var);
-			if ($label === 'object') {
-				$label = get_class($var) . "('object')";
-			}
+			self::$dumps[] = $s;
 		} else {
-			self::$dumps[] = array('title' => $label, 'dump' => $dump);
-		}
-		if ($depth) {
-			Debug::$maxDepth = $depthSave;
+			self::$dumps[$label] = $s;
 		}
 	}
 
@@ -141,12 +131,19 @@ public function onShutdown($presenter, $response) {
 		$entry['info']['request']   = $request->getMethod();
 		$entry['info']['signal']    = $signal;
 
-		$entry['dumps'][] = array('title' => 'HttpRequest', 'dump' => DebugHelpers::clickableDump($httpRequest));
-		$entry['dumps'][] = array('title' => 'PresenterRequest', 'dump' => DebugHelpers::clickableDump($request));
-		$entry['dumps'][] = array('title' => 'Presenter', 'dump' => DebugHelpers::clickableDump($presenter));
-		$entry['dumps'][] = array('title' => 'PresenterResponse', 'dump' => DebugHelpers::clickableDump($response));
+		$entry['dumps']['HttpRequest']       = DebugHelpers::clickableDump($httpRequest);
+		$entry['dumps']['PresenterRequest']  = DebugHelpers::clickableDump($request);
+		$entry['dumps']['Presenter']  = DebugHelpers::clickableDump($presenter);
+		$entry['dumps']['PresenterResponse'] = DebugHelpers::clickableDump($response);
 
-		$entry['dumps'] = array_merge($entry['dumps'], self::$dumps);
+
+		foreach(self::$dumps as $key => $dump) {
+			if (is_numeric($key)) {
+				$entry['dumps'][] = $dump;
+			} else {
+				$entry['dumps'][$key] = $dump;
+			}
+		}
 
 		$session = Environment::getSession('debug/RequestsPanel');
 

diff --git a/bar.requests.panel.phtml b/bar.requests.panel.phtml
@@ -26,11 +26,11 @@
 						<td width=100%>
 								<a class="nette-toggler" rel="next" href="#"><abbr>&#x25ba;</abbr></a>
 								<table class="nette-hidden">
-									<?php foreach ($entry['dumps'] as $dump): ?>
+									<?php foreach ($entry['dumps'] as $key => $dump): ?>
 									<tr>
-										<th><strong><?php echo $dump['title'];?></strong></th>
+										<th><strong><?php if (!is_numeric($key)) echo $key;?></strong></th>
 										<td>
-											<?php echo $dump['dump'] ?>
+											<?php echo $dump ?>
 										</td>
 									</tr>
 								<?php endforeach ?>