From 4586ac5b9f728f31865b4e41f4be6c7d0e16def4 Mon Sep 17 00:00:00 2001
From: mattab <matthieu.aubry@gmail.com>
Date: Fri, 1 Nov 2013 11:58:48 +1300
Subject: [PATCH] Fixes #4265 Removing dependancy on 5.3.6 (in Log.php) and
increasing requirement to 5.3.2
---
core/Log.php | 6 +++++-
core/testMinimumPhpVersion.php | 4 ++--
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/core/Log.php b/core/Log.php
index 4133c33b35..aa5dd5b01f 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 340e73258c..6c860bc4a2 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) {
--
GitLab