Merge branch 'master' into jquery

Conflicts:
	doc/ChangeLog

3 files changed, 8 insertions, 3 deletions

diff --git a/www/gsearch/index.php b/www/gsearch/index.php
index 585536a..70be05e 100644
--- a/www/gsearch/index.php
+++ b/www/gsearch/index.php
@@ -31,7 +31,9 @@ if($GLOBALS['enableGoogleCustomSearch']==false) {
 	echo '<p><small>';
 	echo T_('Admin tips: ');
 	echo T_('To refresh manually Google Custom Search Engine, goes to: ');
-	echo '<a href="http://www.google.com/coop/cse/cref?cref='.ROOT.'search/context.php">http://www.google.com/coop/cse/cref</a><br/>';
+	echo '<a href="http://www.google.com/coop/cse/cref?cref='
+        . ROOT . 'gsearch/context.php">http://www.google.com/coop/cse/cref</a>'
+        . '<br/>';
 	echo T_('If no result appears, check that all the urls are valid in the admin section.');
 	echo '</small></p>';
 	
diff --git a/www/jsScuttle.php b/www/jsScuttle.php
index f37da78..c166755 100644
--- a/www/jsScuttle.php
+++ b/www/jsScuttle.php
@@ -155,7 +155,10 @@ function processVotingResult() {
     var bmnode = document.getElementById('bmv-'+bookmark);
 
     bmnode.parentNode.replaceChild(
-        response.getElementsByTagName('html')[0].firstChild,
+        xmlhttp.responseXML.importNode(
+            response.getElementsByTagName('html')[0].firstChild,
+            true
+        ),
         bmnode
     );
 }
diff --git a/www/rss.php b/www/rss.php
index 6dcfb4c..298d9ba 100644
--- a/www/rss.php
+++ b/www/rss.php
@@ -116,7 +116,7 @@ foreach ($bookmarks_tmp as $key => $row) {
         'title'       => $row['bTitle'],
         'link'        => $_link,
         'description' => $row['bDescription'],
-        'creator'     => $row['username'],
+        'creator'     => SemanticScuttle_Model_UserArray::getName($row),
         'pubdate'     => $_pubdate,
         'tags'        => $row['tags']
     );