Avoid error trying to load binary without any user logged - See #946

cdujeu · cdujeu · commit 16577aea9ad3 · 2015-10-26T08:37:27.000+01:00
diff --git a/core/src/plugins/core.conf/class.AbstractConfDriver.php b/core/src/plugins/core.conf/class.AbstractConfDriver.php
@@ -1240,8 +1240,10 @@ public function switchAction($action, $httpVars, $fileVars)
                 } else if (isSet($httpVars["binary_id"])) {
                     if (isSet($httpVars["user_id"]) && AuthService::getLoggedUser() != null && AuthService::getLoggedUser()->isAdmin()) {
                         $context = array("USER" => $httpVars["user_id"]);
-                    } else {
+                    } else if(AuthService::getLoggedUser() !== null) {
                         $context = array("USER" => AuthService::getLoggedUser()->getId());
+                    } else {
+                        $context = array();
                     }
                     $this->loadBinary($context, $httpVars["binary_id"]);
                 }

Original file line number	Diff line number	Diff line change
`@@ -1240,8 +1240,10 @@ public function switchAction($action, $httpVars, $fileVars)`
`1240`	`1240`	`} else if (isSet($httpVars["binary_id"])) {`
`1241`	`1241`	`if (isSet($httpVars["user_id"]) && AuthService::getLoggedUser() != null && AuthService::getLoggedUser()->isAdmin()) {`
`1242`	`1242`	`$context = array("USER" => $httpVars["user_id"]);`
`1243`		`- } else {`
	`1243`	`+ } else if(AuthService::getLoggedUser() !== null) {`
`1244`	`1244`	`$context = array("USER" => AuthService::getLoggedUser()->getId());`
	`1245`	`+ } else {`
	`1246`	`+ $context = array();`
`1245`	`1247`	`}`
`1246`	`1248`	`$this->loadBinary($context, $httpVars["binary_id"]);`
`1247`	`1249`	`}`