Changed var_export() calls to use "true" as second parameter. Not sure which PHP version it was added in, but I could have sworn it wasn't there last time I checked.
authorDan Fuhry <dan@enanocms.org>
Fri, 19 Nov 2010 02:46:14 -0500
changeset 1327 e8f4dea267c8
parent 1326 f99dfb1b0530
child 1328 2a5845ef8c1d
Changed var_export() calls to use "true" as second parameter. Not sure which PHP version it was added in, but I could have sworn it wasn't there last time I checked.
includes/lang.php
includes/rijndael.php
--- a/includes/lang.php	Fri Nov 19 02:20:16 2010 -0500
+++ b/includes/lang.php	Fri Nov 19 02:46:14 2010 -0500
@@ -600,11 +600,15 @@
 	
 	static function var_export_string($val)
 	{
+		/*
 		ob_start();
 		var_export($val);
 		$contents = ob_get_contents();
 		ob_end_clean();
 		return $contents;
+		*/
+		// Which PHP version was the second parameter added in?? o_O
+		return var_export($val, true);
 	}
 	
 	/**
--- a/includes/rijndael.php	Fri Nov 19 02:20:16 2010 -0500
+++ b/includes/rijndael.php	Fri Nov 19 02:46:14 2010 -0500
@@ -1729,10 +1729,7 @@
 		);
 	}
 	// call var_export and collect contents
-	ob_start();
-	var_export($aes_decrypt_cache);
-	$dec_cache_string = ob_get_contents();
-	ob_end_clean();
+	$dec_cache_string = var_export($aes_decrypt_cache, true);
 	$f = @fopen($cache_file, 'w');
 	if ( !$f )
 		return false;
@@ -1773,10 +1770,7 @@
 		unset($aes_decrypt_cache[$hash]);
 	
 	// call var_export and collect contents
-	ob_start();
-	var_export($aes_decrypt_cache);
-	$dec_cache_string = ob_get_contents();
-	ob_end_clean();
+	$dec_cache_string = var_export($aes_decrypt_cache, true);
 	$f = @fopen($cache_file, 'w');
 	if ( !$f )
 		return false;