getFilteredOption() : pass an optional userObject to be used as merge…

…Role resolver
pydio · Jan 23, 2015 · ef456c0 · ef456c0
1 parent e0efb68
commit ef456c0
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/core/src/core/classes/class.AJXP_Plugin.php b/core/src/core/classes/class.AJXP_Plugin.php
@@ -135,12 +135,15 @@ public function init($options)
         $this->options = array_merge($this->loadOptionsDefaults(), $options);
     }
 
-    protected function getFilteredOption($optionName, $repositoryScope = AJXP_REPO_SCOPE_ALL)
+    protected function getFilteredOption($optionName, $repositoryScope = AJXP_REPO_SCOPE_ALL, $userObject = null)
     {
         if(!is_array($this->options)) $this->options = array();
         $merged = $this->options;
         if(is_array($this->pluginConf)) $merged = array_merge($merged, $this->pluginConf);
-        $loggedUser = AuthService::getLoggedUser();
+        $loggedUser = $userObject;
+        if($loggedUser == null){
+            $loggedUser = AuthService::getLoggedUser();
+        }
         if ($loggedUser != null) {
             if ($repositoryScope == AJXP_REPO_SCOPE_ALL) {
                 $repo = ConfService::getRepository();