aliens/SemanticScuttle
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix tests after last commit

Browse source 
git-svn-id: https://semanticscuttle.svn.sourceforge.net/svnroot/semanticscuttle/trunk@678 b3834d28-1941-0410-a4f8-b48e95affb8f
This commit is contained in:
cweiske 2010-02-20 11:35:16 +00:00
parent 41a29f49ee
commit cae9f4de38
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/SemanticScuttle/Service/Bookmark.php
View file

@ -285,10 +285,13 @@ class SemanticScuttle_Service_Bookmark extends SemanticScuttle_DbService
$userservice = SemanticScuttle_Service_Factory::get('User'); $userservice = SemanticScuttle_Service_Factory::get('User');
$user = $userservice->getCurrentObjectUser(); $user = $userservice->getCurrentObjectUser();
if ($user === null) {
return false;
}
//user has to be either admin, or owner //user has to be either admin, or owner
if ($GLOBALS['adminsCanModifyBookmarksFromOtherUsers'] if ($GLOBALS['adminsCanModifyBookmarksFromOtherUsers']
&& $userservice->isAdmin($user) && $userservice->isAdmin($user->id)
) { ) {
return true; return true;
} else { } else {

1
src/SemanticScuttle/Service/User.php
View file

@ -407,6 +407,7 @@ class SemanticScuttle_Service_User extends SemanticScuttle_DbService
} }
//reload user object //reload user object
$this->getCurrentUser(true); $this->getCurrentUser(true);
$this->getCurrentObjectUser(true);
} }