merge fix from master

diff --git a/doc/ChangeLog b/doc/ChangeLog
index 92898c472ef04da06826a9c79ab0ecd19aea52e8..48ca4257f7308b2b2e082b5ec6b4482de68f70c0 100644 (file)
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,6 +1,11 @@
 ChangeLog for SemantiScuttle
 ============================
 
+0.97.2 - 2011-02-XX
+-------------------
+- Fix bug #3178597: Broken link to context in gsearch admin index page
+
+
 0.97.1 - 2010-09-30
 -------------------
 This is a security release! We do highly recommend to update

diff --git a/www/gsearch/index.php b/www/gsearch/index.php
index 585536aed4a03657f0e5b07d02b8e5da6c28fef6..70be05e961eb393d306c81d4d88c3ae8ef536c51 100644 (file)
--- 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>';