mirror/FreshRSS
0
0
Fork 0
mirror of https://github.com/FreshRSS/FreshRSS.git synced 2026-05-24 16:25:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

Change behaviour if authorizationToUser is null

Browse Source 
authorizationToUser() returns now an empty string by default
If it returns an empty string, conf is set to null and api don't die
anymore.

Fix https://github.com/FreshRSS/FreshRSS/issues/747
This commit is contained in:
Marien Fressinaud
2015-01-13 15:26:42 +01:00
parent 59760580d2
commit e8556ac1a4
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
p/api/greader.php
View File

@@ -168,7 +168,7 @@ function authorizationToUser() {
}
}
}
return null;
return '';
}
function clientLogin($email, $pass) { //http://web.archive.org/web/20130604091042/http://undoc.in/clientLogin.html
@@ -552,10 +552,10 @@ if (!$system_conf->api_enabled) {
Minz_Session::init('FreshRSS');
$user = authorizationToUser();
if (is_null($user)) {
unauthorized();
$conf = null;
if ($user !== '') {
$conf = get_user_configuration($user);
}
$conf = get_user_configuration($user);
logMe('User => ' . $user . "\n");