Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorMartin Keckeis <martin.keckeis1@gmail.com>2014-08-28 18:01:43 +0400
committerMartin Keckeis <martin.keckeis1@gmail.com>2014-08-28 18:01:43 +0400
commit504a99a3ce79fe1ad78e48a2b6a5767ecbb9bf38 (patch)
tree66e7b0574b8bad191a6f7d7c83ff140f3866d6ad /core
parent4201dcfb9e7903c37dddb257e02952c6d9eb82cc (diff)
Update testMinimumPhpVersion.php
Diffstat (limited to 'core')
-rw-r--r--core/testMinimumPhpVersion.php13
1 files changed, 6 insertions, 7 deletions
diff --git a/core/testMinimumPhpVersion.php b/core/testMinimumPhpVersion.php
index 18ccc2c369..b56c1a3c61 100644
--- a/core/testMinimumPhpVersion.php
+++ b/core/testMinimumPhpVersion.php
@@ -31,18 +31,17 @@ if ($minimumPhpInvalid) {
To enjoy Piwik, you need PHP compiled without that configure option.</p>";
}
- if (!function_exists('json_encode')) {
- $piwik_errorMessage .= "<p><strong>Piwik requires the php5-json extension which provides the functions <code>json_encode()</code> and <code>json_decode()</code></strong></p>
- <p>It appears your PHP has not yet installed the php5-json extension.
- To use Piwik, please ask your web host to install php5-json or install it yourself, for example on debian system: <code>sudo apt-get install php5-json</code>. <br/>Then restart your webserver and refresh this page.</p>";
- }
-
-
if (!function_exists('ini_set')) {
$piwik_errorMessage .= "<p><strong>Piwik and Zend_Session require the <code>ini_set()</code> function</strong></p>
<p>It appears your PHP has disabled this function.
To enjoy Piwik, you need remove <pre>ini_set</pre> from your <pre>disable_functions</pre> directive in php.ini, and restart your webserver.</p>";
}
+
+ if (!function_exists('json_encode')) {
+ $piwik_errorMessage .= "<p><strong>Piwik requires the php5-json extension which provides the functions <code>json_encode()</code> and <code>json_decode()</code></strong></p>
+ <p>It appears your PHP has not yet installed the php5-json extension.
+ To use Piwik, please ask your web host to install php5-json or install it yourself, for example on debian system: <code>sudo apt-get install php5-json</code>. <br/>Then restart your webserver and refresh this page.</p>";
+ }
if (!file_exists(PIWIK_INCLUDE_PATH . '/vendor/autoload.php')
&& !file_exists(PIWIK_INCLUDE_PATH . '/../../autoload.php')) {