From 67db678292bea9d89fe66b30a87483b6c18b1411 Mon Sep 17 00:00:00 2001
From: Christian Weiske <cweiske@cweiske.de>
Date: Mon, 14 Feb 2011 18:16:56 +0100
Subject: merge fix from master

---
 doc/ChangeLog         | 5 +++++
 www/gsearch/index.php | 4 +++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/doc/ChangeLog b/doc/ChangeLog
index 92898c4..48ca425 100644
--- 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 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>';
 	
-- 
cgit v1.2.3