Przeglądaj źródła

Fix bad relogging clients (#2961)

* Fix bad relogging clients

Some clients (like EasyRSS) are still using the old HTTP Authorization
header after having logged to log in with another user.
We should not attempt to process Authorization headers during a login
request

* Typo

* A bit safer

Avoid null exception
Alexandre Alapetite 6 lat temu
rodzic
commit
17539668ea
1 zmienionych plików z 4 dodań i 3 usunięć
  1. 4 3
      p/api/greader.php

+ 4 - 3
p/api/greader.php

@@ -929,15 +929,16 @@ ini_set('session.use_cookies', '0');
 register_shutdown_function('session_destroy');
 register_shutdown_function('session_destroy');
 Minz_Session::init('FreshRSS');
 Minz_Session::init('FreshRSS');
 
 
-$user = authorizationToUser();
+$user = $pathInfos[1] === 'accounts' ? '' : authorizationToUser();
 FreshRSS_Context::$user_conf = null;
 FreshRSS_Context::$user_conf = null;
 if ($user !== '') {
 if ($user !== '') {
 	FreshRSS_Context::$user_conf = get_user_configuration($user);
 	FreshRSS_Context::$user_conf = get_user_configuration($user);
 	Minz_ExtensionManager::init();
 	Minz_ExtensionManager::init();
-	Minz_Translate::init(FreshRSS_Context::$user_conf->language);
-
 	if (FreshRSS_Context::$user_conf != null) {
 	if (FreshRSS_Context::$user_conf != null) {
+		Minz_Translate::init(FreshRSS_Context::$user_conf->language);
 		Minz_ExtensionManager::enableByList(FreshRSS_Context::$user_conf->extensions_enabled);
 		Minz_ExtensionManager::enableByList(FreshRSS_Context::$user_conf->extensions_enabled);
+	} else {
+		Minz_Translate::init();
 	}
 	}
 } else {
 } else {
 	Minz_Translate::init();
 	Minz_Translate::init();