diff options
| -rw-r--r-- | config.inc.php.example | 1 | ||||
| -rw-r--r-- | services/bookmarkservice.php | 2 | ||||
| -rw-r--r-- | upgrade.txt | 11 |
3 files changed, 13 insertions, 1 deletions
diff --git a/config.inc.php.example b/config.inc.php.example index a8086f5..1857250 100644 --- a/config.inc.php.example +++ b/config.inc.php.example @@ -30,6 +30,7 @@ $tableprefix = 'sc_'; # table prefix used for this installation. Do not use '-' ### Users ### $adminemail = 'admin@example.org'; # Contact address for the site administrator. Used as the FROM address in password retrieval e-mails. $admin_users = array(''); # admin users = array('adminnickname', 'user1nick', 'user2nick'); +$adminsCanModifyBookmarksFromOtherUsers = true; # 'true' if admin users can edit or delete bookmarks belonging to other users. Else 'false'. $reservedusers = array('all', 'watchlist'); # array of usernames that cannot be registered # Antispam $antispamQuestion = 'name of this application (no Caps)'; # antispamQuestion: A question to avoid spam diff --git a/services/bookmarkservice.php b/services/bookmarkservice.php index 635d8ed..dcce54b 100644 --- a/services/bookmarkservice.php +++ b/services/bookmarkservice.php @@ -107,7 +107,7 @@ class BookmarkService { $userservice = & ServiceFactory :: getServiceInstance('UserService'); $userid = $userservice->getCurrentUserId(); - if ($userservice->isAdmin($userid)) + if ($GLOBALS['adminsCanModifyBookmarksFromOtherUsers'] && $userservice->isAdmin($userid)) return true; else return ($bookmark['uId'] == $userid); diff --git a/upgrade.txt b/upgrade.txt index 6947257..8c9b751 100644 --- a/upgrade.txt +++ b/upgrade.txt @@ -1,5 +1,16 @@ ==== UPGRADE instructions ==== +=== From version 0.92 to 0.93 === +Message: this version modifies the database to UTF-8 charset. The idea is to convert the content (through BLOB type) and then to change the tables' charsets. + +- Backup you database +- Make a copy from your SemanticScuttle Web directory +- Upgrade your database by following instructions ONE after ONE (order is important) : +#NOTHING TO CHANGE IN DB +- Upgrade your current configuration file (config.inc.php) with respect to config.inc.php.example +$adminsCanModifyBookmarksFromOtherUsers = true; # 'true' if admin users can edit or delete bookmarks belonging to other users. Else 'false'. + + === From version 0.91 to 0.92 === Message: this version modifies the database to UTF-8 charset. The idea is to convert the content (through BLOB type) and then to change the tables' charsets. |