diff options
author | Michael Gapczynski <mtgap@owncloud.com> | 2013-05-21 11:26:56 -0400 |
---|---|---|
committer | Michael Gapczynski <mtgap@owncloud.com> | 2013-05-21 11:26:56 -0400 |
commit | c62f230ddb4304faa9455e849b393693fc9b14aa (patch) | |
tree | 2bda839ad01358ed94f6a702ac03e601f29b2891 /lib/util.php | |
parent | 4687f50e754f54349ea33348a45cacddaa10261a (diff) | |
parent | afdad5c74da5c163b01f43046224b376a23f4e60 (diff) | |
download | nextcloud-server-c62f230ddb4304faa9455e849b393693fc9b14aa.tar.gz nextcloud-server-c62f230ddb4304faa9455e849b393693fc9b14aa.zip |
Merge branch 'master' into move-maint-start
Diffstat (limited to 'lib/util.php')
-rwxr-xr-x | lib/util.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/util.php b/lib/util.php index 382c2efce75..f30cdf6a534 100755 --- a/lib/util.php +++ b/lib/util.php @@ -67,6 +67,7 @@ class OC_Util { public static function tearDownFS() { \OC\Files\Filesystem::tearDown(); self::$fsSetup=false; + self::$rootMounted=false; } /** @@ -248,7 +249,7 @@ class OC_Util { 'hint'=>'Please ask your server administrator to install the module.'); $web_server_restart=true; } - if(!function_exists('imagepng')) { + if(!extension_loaded('gd') || !function_exists('gd_info')) { $errors[]=array('error'=>'PHP module GD is not installed.', 'hint'=>'Please ask your server administrator to install the module.'); $web_server_restart=true; |