wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Early errors (in base.php) don't have session available

Browse source
This commit is contained in:
Bart Visscher 2013-07-16 22:37:32 +02:00
parent 49fca86f3c
commit 971a3fd124
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/template.php
View file

@ -181,7 +181,7 @@ class OC_Template{
$this->renderas = $renderas;
$this->application = $app;
$this->vars = array();
$this->vars['requesttoken'] = OC_Util::callRegister();
$this->vars['requesttoken'] = OC::$session && OC_Util::callRegister();
$parts = explode('/', $app); // fix translation when app is something like core/lostpassword
$this->l10n = OC_L10N::get($parts[0]);
@ -243,6 +243,9 @@ class OC_Template{
*/
static public function getFormFactorExtension()
{
if (!\OC::$session) {
return '';
}
// if the formfactor is not yet autodetected do the
// autodetection now. For possible formfactors check the
// detectFormfactor documentation

2
lib/user.php
View file

@ -316,7 +316,7 @@ class OC_User {
* @return string uid or false
*/
public static function getUser() {
$uid = OC::$session->get('user_id');
$uid = OC::$session ? OC::$session->get('user_id') : null;
if (!is_null($uid)) {
return $uid;
} else {