Fix cache.doctrine empty options.

pydio · Feb 19, 2016 · ae3616e · ae3616e
1 parent 2661b57
commit ae3616e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/core/src/plugins/cache.doctrine/class.DoctrineCacheDriver.php b/core/src/plugins/cache.doctrine/class.DoctrineCacheDriver.php
@@ -65,6 +65,9 @@ public function init($options)
 
         $this->cacheDriver = null;
         $this->options = $this->getFilteredOption("DRIVER");
+        if(!is_array($this->options)){
+            return;
+        }
 
         switch ($this->options['driver']) {
             case "apc":

diff --git a/core/src/plugins/cache.doctrine/manifest.xml b/core/src/plugins/cache.doctrine/manifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<cachedriver name="memcache" enabled="no" label="CONF_MESSAGE[Doctrine Cache driver]" description="CONF_MESSAGE[Use doctrine as main caching driver.]" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="file:../core.ajaxplorer/ajxp_registry.xsd">
+<ajxp_plugin name="memcache" enabled="no" label="CONF_MESSAGE[Doctrine Cache driver]" description="CONF_MESSAGE[Use doctrine as main caching driver.]" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="file:../core.ajaxplorer/ajxp_registry.xsd">
     <class_definition filename="plugins/cache.doctrine/class.DoctrineCacheDriver.php" classname="DoctrineCacheDriver"/>
     <client_settings>
         <resources>
@@ -25,4 +25,4 @@
 
         <param group_switch_name="driver" group_switch_label="xcache" group_switch_value="xcache" name="driver" type="hidden" label="" description="" mandatory="false" default="xcache"/>
     </server_settings>
-</cachedriver>
+</ajxp_plugin>