Merge branch 'master' into jquery

Conflicts:
	doc/ChangeLog

1 files changed, 3 insertions, 1 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>';