Kohana v3.3.5

2016-05-01 20:50:24 +10:00
parent 8888719653
commit 68c7f4f159
170 changed files with 4565 additions and 1176 deletions
--- a/system/classes/Kohana/Debug.php
+++ b/system/classes/Kohana/Debug.php
@@ -133,8 +133,8 @@ class Kohana_Debug {

 			if ($marker === NULL)
 			{
-				// Make a unique marker
-				$marker = uniqid("\x00");
+				// Make a unique marker - force it to be alphanumeric so that it is always treated as a string array key
+				$marker = uniqid("\x00")."x";
 			}

 			if (empty($var))