summaryrefslogtreecommitdiffstats
path: root/lib/init.php
diff options
context:
space:
mode:
authorPaul Arthur <paul.arthur@flowerysong.com>2013-02-03 04:24:08 -0500
committerPaul Arthur <paul.arthur@flowerysong.com>2013-02-03 04:34:57 -0500
commit10d54c9f7fd0b15b64a0474c6f33b63caabc4d03 (patch)
treeb6e372a8b1d123ccb4408611cf8638ab87865c52 /lib/init.php
parent287ddc4345a88997f066bf9f8b78410b30b7bf4a (diff)
downloadampache-10d54c9f7fd0b15b64a0474c6f33b63caabc4d03.tar.gz
ampache-10d54c9f7fd0b15b64a0474c6f33b63caabc4d03.tar.bz2
ampache-10d54c9f7fd0b15b64a0474c6f33b63caabc4d03.zip
Fix up the tests a bit
The hash check shouldn't be mixed in with the version check, and we now need JSON.
Diffstat (limited to 'lib/init.php')
-rw-r--r--lib/init.php5
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/init.php b/lib/init.php
index 8b8248f0..672f945e 100644
--- a/lib/init.php
+++ b/lib/init.php
@@ -53,7 +53,10 @@ else {
// Verify that a few important but commonly disabled PHP functions exist and
// that we're on a usable version
-if (!function_exists('hash') || !function_exists('inet_pton') || (floatval(phpversion()) < 5.3) || !class_exists('PDO')) {
+if (!function_exists('json_encode') ||
+ !function_exists('hash') ||
+ (floatval(phpversion()) < 5.3) ||
+ !class_exists('PDO')) {
$link = $path . '/test.php';
}