Merge branch 'master' into privatekey2

Conflicts:

	data/templates/default/bookmarks.tpl.php

1 files changed, 0 insertions, 34 deletions

diff --git a/data/templates/sidebar.block.users.php b/data/templates/sidebar.block.users.php
deleted file mode 100644
index 58fdfb7..0000000
--- a/data/templates/sidebar.block.users.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-/* Service creation: only useful services are created */
-//No specific services
-
-$logged_on_userid = $userservice->getCurrentUserId();
-if ($logged_on_userid === false) {
-    $logged_on_userid = NULL;
-}
-$lastUsers = $userservice->getUsers(3);
-
-if ($lastUsers && count($lastUsers) > 0) {
-?>
-
-<h2><?php echo T_('New Users'); ?></h2>
-<div id="users">
-<table>
-<?php
-foreach ($lastUsers as $row) {
-    echo '<tr><td>';
-    echo  '<a href="'.createURL('profile', $row['username']).'">';
-    echo SemanticScuttle_Model_UserArray::getName($row);
-    echo '</a>';
-    echo ' (<a href="'.createURL('bookmarks', $row['username']).'">'.T_('bookmarks').'</a>)';
-    echo '</td></tr>';
-}
-//echo '<tr><td><a href="'.createURL('users').'">...</a></td></tr>';
-?>
-
-</table>
-<p style="text-align:right"><a href="<?php echo createURL('users'); ?>" title="<?php echo T_('See all users')?>"><?php echo T_('All users'); ?></a> →</p>
-</div>
-<?php
-}
-?>