diff --git a/core/Log.php b/core/Log.php index 4133c33b35726492b9f6f1cdd7fa574be441ef2c..aa5dd5b01f2412abb9289a669d69277cb2c6b269 100644 --- a/core/Log.php +++ b/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 diff --git a/core/testMinimumPhpVersion.php b/core/testMinimumPhpVersion.php index 340e73258c324386a85edee881f475db442304b5..6c860bc4a20d2082ebebceda8d805bbf5644154c 100644 --- a/core/testMinimumPhpVersion.php +++ b/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) {