From cae9f4de38376974b805dab6b7a95105dc61dfd9 Mon Sep 17 00:00:00 2001
From: cweiske <cweiske@b3834d28-1941-0410-a4f8-b48e95affb8f>
Date: Sat, 20 Feb 2010 11:35:16 +0000
Subject: fix tests after last commit

git-svn-id: https://semanticscuttle.svn.sourceforge.net/svnroot/semanticscuttle/trunk@678 b3834d28-1941-0410-a4f8-b48e95affb8f
---
 src/SemanticScuttle/Service/Bookmark.php | 5 ++++-
 src/SemanticScuttle/Service/User.php     | 1 +
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/SemanticScuttle/Service/Bookmark.php b/src/SemanticScuttle/Service/Bookmark.php
index 37a6a5e..87d9e02 100644
--- a/src/SemanticScuttle/Service/Bookmark.php
+++ b/src/SemanticScuttle/Service/Bookmark.php
@@ -285,10 +285,13 @@ class SemanticScuttle_Service_Bookmark extends SemanticScuttle_DbService
 
         $userservice = SemanticScuttle_Service_Factory::get('User');
         $user = $userservice->getCurrentObjectUser();
+        if ($user === null) {
+            return false;
+        }
 
         //user has to be either admin, or owner
         if ($GLOBALS['adminsCanModifyBookmarksFromOtherUsers']
-            && $userservice->isAdmin($user)
+            && $userservice->isAdmin($user->id)
         ) {
             return true;
         } else {
diff --git a/src/SemanticScuttle/Service/User.php b/src/SemanticScuttle/Service/User.php
index 7b03dd2..281c18c 100644
--- a/src/SemanticScuttle/Service/User.php
+++ b/src/SemanticScuttle/Service/User.php
@@ -407,6 +407,7 @@ class SemanticScuttle_Service_User extends SemanticScuttle_DbService
         }
         //reload user object
         $this->getCurrentUser(true);
+        $this->getCurrentObjectUser(true);
     }
 
 
-- 
cgit v1.2.3