2 files changed, 5 insertions, 3 deletions
diff --git a/modules/user/helpers/user.php b/modules/user/helpers/user.php
index e7a3e165..a04542d3 100644
--- a/modules/user/helpers/user.php
+++ b/modules/user/helpers/user.php
@@ -73,7 +73,7 @@ class user_Core {
    * @return User_Model
    */
   static function guest() {
-    return ORM::factory("user", 1);
+    return model_cache::get("user", 1);
   }
 
   /**
diff --git a/modules/user/helpers/user_block.php b/modules/user/helpers/user_block.php
index b737cec6..51d4908d 100644
--- a/modules/user/helpers/user_block.php
+++ b/modules/user/helpers/user_block.php
@@ -22,8 +22,10 @@ class user_block_Core {
     $url = url::file("modules/user/js/user.js");
     $script[] = "<script src=\"$url\" type=\"text/javascript\"></script>";
     $user = user::active();
-    $url = url::file("lib/jquery.jeditable.js");
-    $script[] = empty($user) ? "" : "<script src=\"$url\" type=\"text/javascript\"></script>";
+    if (!user::active()->guest) {
+      $url = url::file("lib/jquery.jeditable.js");
+      $script[] = "<script src=\"$url\" type=\"text/javascript\"></script>";
+    }
     return implode("\n", $script);
   }