Minor updates

glowieframework · Apr 1, 2024 · 6d5ef07 · 6d5ef07
1 parent d622178
commit 6d5ef07
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/src/Tools/Authenticator.php b/src/Tools/Authenticator.php
@@ -135,7 +135,12 @@ public function getUser(){
          * @return mixed Returns the primary key value if authenticated, null otherwise.
          */
         public function getUserId(){
-            return self::$user ? self::$user->getPrimary() : null;
+            if(!self::$user){
+                $user = $this->getUser();
+                if(!$user) return null;
+            }
+
+            return self::$user->getPrimary();
         }
 
         /**

diff --git a/src/View/Skeltch.php b/src/View/Skeltch.php
@@ -188,7 +188,7 @@ private static function compileLoops(string $code){
          * @return string Returns the compiled code.
          */
         private static function compileForEachs(string $code){
-            return preg_replace_callback('~(?<!@){\s*foreach\s*\((.+?)\s+as\s+(.+?)(\s+=> (.*?))?\)\s*}~is', function($matches){
+            return preg_replace_callback('~(?<!@){\s*foreach\s*\((.+?)\s+as\s+(.+?)(\s+=>\s+(.*?))?\)\s*}~is', function($matches){
                 if(isset($matches[4])){
                     return sprintf('<?php \Glowie\Core\View\Skeltch::resetLoop(); foreach(%s as %s => %s): $loop = \Glowie\Core\View\Skeltch::getLoop(%s); ?>', $matches[1], $matches[2], $matches[4], $matches[1]);
                 }else{