1 files changed, 5 insertions, 4 deletions
diff --git a/templates/sidebar.block.watchstatus.php b/templates/sidebar.block.watchstatus.php
index d912846..99574aa 100644
--- a/templates/sidebar.block.watchstatus.php
+++ b/templates/sidebar.block.watchstatus.php
@@ -1,10 +1,11 @@
 <?php
-$userservice =& ServiceFactory::getServiceInstance('UserService');
+/* Service creation: only useful services are created */
+//No specific services
+
+
 if ($userservice->isLoggedOn()) {
-    $currentUser = $userservice->getCurrentUser();
-    $currentUsername = $currentUser[$userservice->getFieldName('username')];
 
-    if ($currentUsername != $user) {
+    if ($currentUser->getUsername() != $user) {
         $result = $userservice->getWatchStatus($userid, $userservice->getCurrentUserId());
         if ($result) {
             $linkText = T_('Remove from Watchlist');