diff options
| author | Andrew Manning <tamanning@zoho.com> | 2016-07-21 21:14:54 -0400 |
|---|---|---|
| committer | Andrew Manning <tamanning@zoho.com> | 2016-07-21 21:14:54 -0400 |
| commit | 5a63ddd6457ae4dba61ff30db5b6601b22ddd1b6 (patch) | |
| tree | 84b9b847f384c42a462a0035142b4b5757906922 /util | |
| parent | d504197a786eb46a780278fccb529daa13bfa443 (diff) | |
| parent | 8566f9130395ecdbe19f9fce85a26dac39d9fe24 (diff) | |
| download | volse-hubzilla-5a63ddd6457ae4dba61ff30db5b6601b22ddd1b6.tar.gz volse-hubzilla-5a63ddd6457ae4dba61ff30db5b6601b22ddd1b6.tar.bz2 volse-hubzilla-5a63ddd6457ae4dba61ff30db5b6601b22ddd1b6.zip | |
Merge remote-tracking branch 'upstream/dev' into website-import
Diffstat (limited to 'util')
| -rwxr-xr-x | util/fresh | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/util/fresh b/util/fresh index 9d74ea584..7f57931aa 100755 --- a/util/fresh +++ b/util/fresh @@ -82,12 +82,15 @@ function process_command($line) { exec('/bin/stty echo'); echo "\n"; require_once('include/auth.php'); - $record = App::$account = account_verify_password(argv(1),trim($x,"\n")); + $record = null; + $x = account_verify_password(argv(1),trim($x,"\n")); + if($x['account']) + $record = App::$account = $x['account']; if($record) { $_SESSION['account_id'] = App::$account['account_id']; $_SESSION['last_login_date'] = datetime_convert(); - authenticate_success($record, true, true); + authenticate_success($record, $x['channel'], true, true); echo 'logged in'; $channel = App::get_channel(); if($channel) |