diff --git a/_sakura/changelog.json b/_sakura/changelog.json index bbafe29..7f36c47 100644 --- a/_sakura/changelog.json +++ b/_sakura/changelog.json @@ -39,7 +39,8 @@ "20150730", "20150731", "20150807", - "20150809" + "20150809", + "20150810" ] @@ -1675,6 +1676,15 @@ "change": "Fixed references to old urls variable." } + ], + + "20150810": [ + + { + "type": "FIX", + "change": "Attempt to fix error while trying to get the old avatar name." + } + ] } diff --git a/_sakura/sakura.php b/_sakura/sakura.php index 6dd7e78..3818680 100644 --- a/_sakura/sakura.php +++ b/_sakura/sakura.php @@ -8,7 +8,7 @@ namespace Sakura; // Define Sakura version -define('SAKURA_VERSION', '20150809'); +define('SAKURA_VERSION', '20150810'); define('SAKURA_VLABEL', 'Eminence'); define('SAKURA_COLOUR', '#6C3082'); define('SAKURA_STABLE', false); diff --git a/main/settings.php b/main/settings.php index f83a1a6..be4c442 100644 --- a/main/settings.php +++ b/main/settings.php @@ -245,7 +245,7 @@ if(isset($_REQUEST['request-notifications']) && $_REQUEST['request-notifications // Set path variables $filepath = ROOT . Configuration::getConfig('user_uploads') .'/'; $filename = $filepath .'avatar_'. Session::$userId; - $currfile = !empty($_AVA = Users::getUser(Session::$userId)['userData']['userAvatar']) ? $_AVA : null; + $currfile = isset(Users::getUser(Session::$userId)['userData']['userAvatar']) && !empty($_AVA = Users::getUser(Session::$userId)['userData']['userAvatar']) ? $_AVA : null; // Check if $_FILES is set if(!isset($_FILES['avatar']) && empty($_FILES['avatar'])) {