From: Christian Weiske <cweiske@cweiske.de>
Date: Sun, 20 Mar 2011 21:15:34 +0000 (+0100)
Subject: Merge branch 'master' into jquery
X-Git-Tag: v0.98.0~136
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=bc178983b370ed005d569d70b4629e3181acc522;p=semanticscuttle.git

Merge branch 'master' into jquery

Conflicts:
	doc/ChangeLog
---

bc178983b370ed005d569d70b4629e3181acc522
diff --cc data/templates/bookmarks.tpl.php
index 34beb39,c404358..55d6a0f
--- a/data/templates/bookmarks.tpl.php
+++ b/data/templates/bookmarks.tpl.php
@@@ -312,10 -309,11 +312,11 @@@ if ($currenttag!= '') 
  			$copy .= T_('you');
  		} else {
  			$copy .= '<a href="' . createURL('bookmarks', $row['username']) . '">'
-                 . $row['username'] . '</a>';
+                 . SemanticScuttle_Model_UserArray::getName($row)
+                 . '</a>';
  		}
  
 -		// Udders!
 +		// others
  		if (!isset($hash)) {
  			$others = $otherCounts[$row['bAddress']];
  			$ostart = '<a href="' . createURL('history', $row['bHash']) . '">';