fix backtrace parsing of dumped value

leeoniya · May 18, 2015 · 6cae2c8 · 6cae2c8
1 parent b524591
commit 6cae2c8
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/src/dump_r/Core.php b/src/dump_r/Core.php
@@ -23,9 +23,16 @@ public static function dump_r(&$raw, $ret = false, $html = true, $depth = 1e3, $
 		$idx = strpos($src[0]['file'], 'dump_r.php') ? 1 : 0;
 		$src = (object)$src[$idx];
 		$file = file($src->file);
-		$line = $file[$src->line - 1];
-		preg_match('/dump_r\((.+?)(?:,|\)(;|\?>))/', $line, $m);
-		$key = $m[1];		// fixme!
+
+		$i = 1;
+		do {
+			$line = $file[$src->line - $i++];
+		} while (strpos($line, 'dump_r') === false);
+
+		preg_match('/dump_r\((.+?)\)?(?:$|;|\?>)/', $line, $m);
+		$key = $m[1];
+
+		$key = trim(explode(',', $key)[0]);
 
 		if (PHP_SAPI == 'cli' || !$html)
 			$out = $root->text0($src->file, $src->line, $key);