git pushMerge branch 'master' of github.com:piwik/piwik

core/Log.php

@@ -455,7 +455,11 @@ class Log extends Singleton
                 $message = vsprintf($message, $sprintfParams);
             }
 
-            $backtrace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
+            if (version_compare(phpversion(), '5.3.6', '>=')) {
+                $backtrace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS | DEBUG_BACKTRACE_PROVIDE_OBJECT);
+            } else {
+                $backtrace = debug_backtrace();
+            }
             $tag = Plugin::getPluginNameFromBacktrace($backtrace);
 
             // if we can't determine the plugin, use the name of the calling class

core/testMinimumPhpVersion.php

@@ -17,8 +17,8 @@
 
 $piwik_errorMessage = '';
 
-// Minimum requirement: Namespaces in 5.3
-$piwik_minimumPHPVersion = '5.3';
+// Minimum requirement: stream_resolve_include_path in 5.3.2, namespaces in 5.3
+$piwik_minimumPHPVersion = '5.3.2';
 $piwik_currentPHPVersion = PHP_VERSION;
 $minimumPhpInvalid = version_compare($piwik_minimumPHPVersion, $piwik_currentPHPVersion) > 0;
 if ($minimumPhpInvalid) {