[geeklog-cvs] geeklog: merged with Dirks changes
geeklog-cvs at lists.geeklog.net
geeklog-cvs at lists.geeklog.net
Sun Apr 25 15:10:33 EDT 2010
changeset 7899:57b8b63a1da7
url: http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/57b8b63a1da7
user: Sami Barakat <sami at sbarakat.co.uk>
date: Sun Apr 25 20:15:28 2010 +0100
description:
merged with Dirks changes
diffstat:
plugins/staticpages/functions.inc | 2 +-
system/classes/listfactory.class.php | 6 +++---
system/classes/search.class.php | 6 +++---
3 files changed, 7 insertions(+), 7 deletions(-)
diffs (72 lines):
diff -r a76d67584468 -r 57b8b63a1da7 plugins/staticpages/functions.inc
--- a/plugins/staticpages/functions.inc Sun Apr 25 17:55:52 2010 +0200
+++ b/plugins/staticpages/functions.inc Sun Apr 25 20:15:28 2010 +0100
@@ -786,7 +786,7 @@
// Search static page comments
$sql = "SELECT c.cid AS id, c.title AS title, c.comment AS description, ";
- $sql .= "UNIX_TIMESTAMP(c.date) AS date, c.uid AS uid, ";
+ $sql .= "UNIX_TIMESTAMP(c.date) AS date, c.uid AS uid, '0' AS hits, ";
// MSSQL has a problem when concatenating numeric values
if ($_DB_dbms == 'mssql') {
diff -r a76d67584468 -r 57b8b63a1da7 system/classes/listfactory.class.php
--- a/system/classes/listfactory.class.php Sun Apr 25 17:55:52 2010 +0200
+++ b/system/classes/listfactory.class.php Sun Apr 25 20:15:28 2010 +0100
@@ -2,7 +2,7 @@
/* Reminder: always indent with 4 spaces (no tabs). */
// +---------------------------------------------------------------------------+
-// | Geeklog 1.6 |
+// | Geeklog 1.7 |
// +---------------------------------------------------------------------------+
// | listfactory.class.php |
// | |
@@ -12,7 +12,7 @@
// +---------------------------------------------------------------------------+
// | Copyright (C) 2000-2010 by the following authors: |
// | |
-// | Authors: Sami Barakat - s.m.barakat AT gmail DOT com |
+// | Authors: Sami Barakat - sami AT sbarakat DOT co DOT uk |
// +---------------------------------------------------------------------------+
// | |
// | This program is free software; you can redistribute it and/or |
@@ -454,7 +454,7 @@
if (isset($_GET['order'])) {
// Loop though the order fields and find a match against $_GET param
foreach ($this->_fields as $field) {
- if ($field['sort'] == true && $field['name'] == $_GET['order']) {
+ if ($field['sort'] == true && strcmp($field['name'], $_GET['order']) == 0) {
$this->_sort_arr['field'] = $field['name']; // Use a trusted value
break;
}
diff -r a76d67584468 -r 57b8b63a1da7 system/classes/search.class.php
--- a/system/classes/search.class.php Sun Apr 25 17:55:52 2010 +0200
+++ b/system/classes/search.class.php Sun Apr 25 20:15:28 2010 +0100
@@ -2,7 +2,7 @@
/* Reminder: always indent with 4 spaces (no tabs). */
// +---------------------------------------------------------------------------+
-// | Geeklog 1.6 |
+// | Geeklog 1.7 |
// +---------------------------------------------------------------------------+
// | search.class.php |
// | |
@@ -12,7 +12,7 @@
// | |
// | Authors: Tony Bibbs - tony AT geeklog DOT net |
// | Dirk Haun - dirk AT haun-online DOT de |
-// | Sami Barakat - s.m.barakat AT gmail DOT com |
+// | Sami Barakat - sami AT sbarakat DOT co DOT uk |
// +---------------------------------------------------------------------------+
// | |
// | This program is free software; you can redistribute it and/or |
@@ -355,7 +355,7 @@
// Search Story Comments
$sql = 'SELECT c.cid AS id, c.title AS title, c.comment AS description, ';
- $sql .= 'UNIX_TIMESTAMP(c.date) AS date, c.uid AS uid, ';
+ $sql .= 'UNIX_TIMESTAMP(c.date) AS date, c.uid AS uid, \'0\' AS hits, ';
// MSSQL has a problem when concatenating numeric values
if ($_DB_dbms == 'mssql') {
More information about the geeklog-cvs
mailing list