[Piwik-svn] r494 - trunk/modules

[svnmaster at piwik.org]

Author: matt
Date: 2008-05-29 03:34:23 +0200 (Thu, 29 May 2008)
New Revision: 494

Modified:
   trunk/modules/Common.php
   trunk/modules/Piwik.php
Log:
- php5.3 fix: now magic quotes are trowing an error because they are deprecated

Modified: trunk/modules/Common.php
===================================================================
--- trunk/modules/Common.php	2008-05-29 01:32:32 UTC (rev 493)
+++ trunk/modules/Common.php	2008-05-29 01:34:23 UTC (rev 494)
@@ -182,8 +182,9 @@
 		{
 			$value = htmlspecialchars($value, Piwik_Common::HTML_ENCODING_QUOTE_STYLE, 'UTF-8');
 
-			/* Undo the damage caused by magic_quotes */
-			if (get_magic_quotes_gpc())
+			// Undo the damage caused by magic_quotes -- only before php 5.3 as it is now deprecated
+			if ( version_compare(phpversion(), '5.3') === -1 
+				&& get_magic_quotes_gpc())
 			{
 				$value = stripslashes($value);
 			}

Modified: trunk/modules/Piwik.php
===================================================================
--- trunk/modules/Piwik.php	2008-05-29 01:32:32 UTC (rev 493)
+++ trunk/modules/Piwik.php	2008-05-29 01:34:23 UTC (rev 494)
@@ -353,7 +353,6 @@
 				Piwik::log($prefixString);
 			}
 			Piwik::log("Memory usage = $usage Mb");
-			Piwik::log();
 		}
 		else
 		{