Refactor isUserIsAnonymous

1 files changed, 8 insertions, 2 deletions

diff --git a/core/Piwik.php b/core/Piwik.php
index f8d6df175e..625a7cf9f8 100644
--- a/core/Piwik.php
+++ b/core/Piwik.php
@@ -189,7 +189,12 @@ class Piwik
      */
     public static function getCurrentUserLogin()
     {
-        return Access::getInstance()->getLogin();
+        $login = Access::getInstance()->getLogin();
+
+        if(empty($login)) {
+            return 'anonymous';
+        }
+        return $login;
     }
 
     /**
@@ -296,7 +301,8 @@ class Piwik
      */
     public static function isUserIsAnonymous()
     {
-        return Piwik::getCurrentUserLogin() == 'anonymous';
+        $currentUserLogin = Piwik::getCurrentUserLogin();
+        return $currentUserLogin == 'anonymous';
     }
 
     /**