Merge branch 'master' into privatekey2

Conflicts:

	data/templates/default/bookmarks.tpl.php

1 files changed, 28 insertions, 0 deletions

diff --git a/data/templates/default/sidebar.block.watchstatus.php b/data/templates/default/sidebar.block.watchstatus.php
new file mode 100644
index 0000000..99574aa
--- /dev/null
+++ b/data/templates/default/sidebar.block.watchstatus.php
@@ -0,0 +1,28 @@
+<?php
+/* Service creation: only useful services are created */
+//No specific services
+
+
+if ($userservice->isLoggedOn()) {
+
+    if ($currentUser->getUsername() != $user) {
+        $result = $userservice->getWatchStatus($userid, $userservice->getCurrentUserId());
+        if ($result) {
+            $linkText = T_('Remove from Watchlist');
+        } else {
+            $linkText = T_('Add to Watchlist');
+        }
+        $linkAddress = createURL('watch', $user);
+?>
+
+<h2><?php echo T_('Actions'); ?></h2>
+<div id="watchlist">
+    <ul>
+        <li><a href="<?php echo $linkAddress ?>"><?php echo $linkText ?></a></li>
+    </ul>
+</div>
+
+<?php
+    }
+}
+?>
\ No newline at end of file