Fix the versions diff viewer

contao · Sep 26, 2013 · f8b8348 · f8b8348
1 parent cb375c9
commit f8b8348
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/system/modules/core/classes/Versions.php b/system/modules/core/classes/Versions.php
@@ -369,6 +369,8 @@ public function compare()
 
 		$GLOBALS['TL_CONFIG']['debugMode'] = false;
 		$objTemplate->output();
+
+		exit;
 	}
 
 

diff --git a/system/modules/core/vendor/phpdiff/Diff/Renderer/Html/Array.php b/system/modules/core/vendor/phpdiff/Diff/Renderer/Html/Array.php
@@ -177,7 +177,8 @@ private function formatLines($lines)
 		$lines = array_map(array($this, 'ExpandTabs'), $lines);
 		$lines = array_map(array($this, 'HtmlSafe'), $lines);
 		foreach($lines as &$line) {
-			$line = preg_replace('# ( +)|^ #e', "\$this->fixSpaces('\\1')", $line);
+			// PATCH: use preg_replace_callback instead of /e
+			$line = preg_replace_callback('# ( +)|^ #', array($this, 'fixSpaces'), $line);
 		}
 		return $lines;
 	}
@@ -190,6 +191,12 @@ private function formatLines($lines)
 	 */
 	function fixSpaces($spaces='')
 	{
+		// PATCH: preg_replace_callback will pass an array as argument
+		if (is_array($spaces)) {
+			$spaces = $spaces[0];
+		}
+		// PATCH EOF
+
 		$count = strlen($spaces);
 		if($count == 0) {
 			return '';
-Original file line number
+Diff line change
@@ Expand Up / @@ -369,6 +369,8 @@ public function compare() @@
     		$GLOBALS['TL_CONFIG']['debugMode'] = false;
     		$objTemplate->output();
+    		exit;
     	}
@@ Expand Down @@