[geeklog-cvs] geeklog: Search now uses pre-existing $_CONF variables instead o...
geeklog-cvs at lists.geeklog.net
geeklog-cvs at lists.geeklog.net
Tue Mar 31 18:47:59 EDT 2009
details: http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/798b4a89704c
changeset: 6885:798b4a89704c
user: Sami Barakat
date: Tue Mar 31 23:45:11 2009 +0100
description:
Search now uses pre-existing $_CONF variables instead of its own (bug #0000839)
diffstat:
7 files changed, 2 insertions(+), 20 deletions(-)
language/english.php | 2 --
language/english_utf-8.php | 2 --
public_html/admin/install/config-install.php | 2 --
public_html/docs/config.html | 8 --------
sql/updates/mssql_1.5.2_to_1.6.0.php | 2 --
sql/updates/mysql_1.5.2_to_1.6.0.php | 2 --
system/classes/search.class.php | 4 ++--
diffs (92 lines):
diff -r c641bc40ac18 -r 798b4a89704c language/english.php
--- a/language/english.php Tue Mar 31 21:45:20 2009 +0100
+++ b/language/english.php Tue Mar 31 23:45:11 2009 +0100
@@ -1798,8 +1798,6 @@
'search_limits' => "Page Limits",
'search_show_num' => "Show Result Number?",
'search_show_type' => "Show Result Type?",
- 'search_show_user' => "Show Author?",
- 'search_show_hits' => "Show Number of Hits?",
'search_show_sort' => "Allow User to Sort Results?",
'search_show_limit' => "Show Page Limits?",
'search_no_data' => "If No Data is Avaliable, Display",
diff -r c641bc40ac18 -r 798b4a89704c language/english_utf-8.php
--- a/language/english_utf-8.php Tue Mar 31 21:45:20 2009 +0100
+++ b/language/english_utf-8.php Tue Mar 31 23:45:11 2009 +0100
@@ -1798,8 +1798,6 @@
'search_limits' => "Page Limits",
'search_show_num' => "Show Result Number?",
'search_show_type' => "Show Result Type?",
- 'search_show_user' => "Show Author?",
- 'search_show_hits' => "Show Number of Hits?",
'search_show_sort' => "Allow User to Sort Results?",
'search_show_limit' => "Show Page Limits?",
'search_no_data' => "If No Data is Avaliable, Display",
diff -r c641bc40ac18 -r 798b4a89704c public_html/admin/install/config-install.php
--- a/public_html/admin/install/config-install.php Tue Mar 31 21:45:20 2009 +0100
+++ b/public_html/admin/install/config-install.php Tue Mar 31 23:45:11 2009 +0100
@@ -92,8 +92,6 @@
$c->add('search_show_sort',TRUE,'select',0,6,1,654,TRUE);
$c->add('search_show_num',TRUE,'select',0,6,1,657,TRUE);
$c->add('search_show_type',TRUE,'select',0,6,1,660,TRUE);
- $c->add('search_show_user',TRUE,'select',0,6,1,663,TRUE);
- $c->add('search_show_hits',TRUE,'select',0,6,1,666,TRUE);
$c->add('search_no_data','<i>Not available...</i>','text',0,6,NULL,669,TRUE);
$c->add('search_separator',' > ','text',0,6,NULL,672,TRUE);
$c->add('search_def_keytype','phrase','select',0,6,20,675,TRUE);
diff -r c641bc40ac18 -r 798b4a89704c public_html/docs/config.html
--- a/public_html/docs/config.html Tue Mar 31 21:45:20 2009 +0100
+++ b/public_html/docs/config.html Tue Mar 31 23:45:11 2009 +0100
@@ -296,14 +296,6 @@
<td valign="top">true</td>
<td valign="top">Shows (= true) or hides (= false) the plugin name the result came from.</td></tr>
<tr>
- <td valign="top"><a name="desc_search_show_user">search_show_user</a></td>
- <td valign="top">true</td>
- <td valign="top">Shows (= true) or hides (= false) the author of a result.</td></tr>
-<tr>
- <td valign="top"><a name="desc_search_show_hits">search_show_hits</a></td>
- <td valign="top">true</td>
- <td valign="top">Shows (= true) or hides (= false) the number of hits a result has received.</td></tr>
-<tr>
<td valign="top"><a name="desc_search_no_data">search_no_data</a></td>
<td valign="top"><i>Not available...</i></td>
<td valign="top">When there is an incompatibility between plugin and Geeklog display this string.</td></tr>
diff -r c641bc40ac18 -r 798b4a89704c sql/updates/mssql_1.5.2_to_1.6.0.php
--- a/sql/updates/mssql_1.5.2_to_1.6.0.php Tue Mar 31 21:45:20 2009 +0100
+++ b/sql/updates/mssql_1.5.2_to_1.6.0.php Tue Mar 31 23:45:11 2009 +0100
@@ -43,8 +43,6 @@
$c->add('search_show_sort',TRUE,'select',0,6,1,654,TRUE);
$c->add('search_show_num',TRUE,'select',0,6,1,657,TRUE);
$c->add('search_show_type',TRUE,'select',0,6,1,660,TRUE);
- $c->add('search_show_user',TRUE,'select',0,6,1,663,TRUE);
- $c->add('search_show_hits',TRUE,'select',0,6,1,666,TRUE);
$c->add('search_no_data','<i>Not available...</i>','text',0,6,NULL,669,TRUE);
$c->add('search_separator',' > ','text',0,6,NULL,672,TRUE);
$c->add('search_def_keytype','phrase','select',0,6,20,675,TRUE);
diff -r c641bc40ac18 -r 798b4a89704c sql/updates/mysql_1.5.2_to_1.6.0.php
--- a/sql/updates/mysql_1.5.2_to_1.6.0.php Tue Mar 31 21:45:20 2009 +0100
+++ b/sql/updates/mysql_1.5.2_to_1.6.0.php Tue Mar 31 23:45:11 2009 +0100
@@ -44,8 +44,6 @@
$c->add('search_show_sort',TRUE,'select',0,6,1,654,TRUE);
$c->add('search_show_num',TRUE,'select',0,6,1,657,TRUE);
$c->add('search_show_type',TRUE,'select',0,6,1,660,TRUE);
- $c->add('search_show_user',TRUE,'select',0,6,1,663,TRUE);
- $c->add('search_show_hits',TRUE,'select',0,6,1,666,TRUE);
$c->add('search_no_data','<i>Not available...</i>','text',0,6,NULL,669,TRUE);
$c->add('search_separator',' > ','text',0,6,NULL,672,TRUE);
$c->add('search_def_keytype','phrase','select',0,6,20,675,TRUE);
diff -r c641bc40ac18 -r 798b4a89704c system/classes/search.class.php
--- a/system/classes/search.class.php Tue Mar 31 21:45:20 2009 +0100
+++ b/system/classes/search.class.php Tue Mar 31 23:45:11 2009 +0100
@@ -493,8 +493,8 @@
$show_num = $_CONF['search_show_num'];
$show_type = $_CONF['search_show_type'];
- $show_user = $_CONF['search_show_user'];
- $show_hits = $_CONF['search_show_hits'];
+ $show_user = $_CONF['contributedbyline'];
+ $show_hits = !$_CONF['hideviewscount'];
$style = isset($_CONF['search_style']) ? $_CONF['search_style'] : 'google';
if ($style == 'table')
More information about the geeklog-cvs
mailing list