[geeklog-hg] geeklog: Fixed SQL error when sort by topic in the admin for sto...

[geeklog-cvs at lists.geeklog.net]

changeset 9182:8624efca6b2d
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/8624efca6b2d
user: dengen <taharaxp at gmail.com>
date: Sat Jul 13 20:40:13 2013 +0900
description:
Fixed SQL error when sort by topic in the admin for stories (bug #0001642)

diffstat:

 public_html/admin/story.php |  2 +-
 system/lib-admin.php        |  2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diffs (24 lines):

diff -r c5fc7b9e0f1d -r 8624efca6b2d public_html/admin/story.php
--- a/public_html/admin/story.php	Sat Jul 13 19:09:35 2013 +0900
+++ b/public_html/admin/story.php	Sat Jul 13 20:40:13 2013 +0900
@@ -171,7 +171,7 @@
         $header_arr[] = array('text' => $LANG24[7], 'field' => 'username', 'sort' => true); // author
     }
     $header_arr[] = array('text' => $LANG24[15], 'field' => 'unixdate', 'sort' => true); // date
-    $header_arr[] = array('text' => $LANG_ADMIN['topic'], 'field' => 'topic_ids', 'sort' => true);
+    $header_arr[] = array('text' => $LANG_ADMIN['topic'], 'field' => 'tid', 'sort' => true);
     $header_arr[] = array('text' => $LANG24[32], 'field' => 'featured', 'sort' => true);
 
     if (SEC_hasRights ('story.ping') && ($_CONF['trackback_enabled'] ||
diff -r c5fc7b9e0f1d -r 8624efca6b2d system/lib-admin.php
--- a/system/lib-admin.php	Sat Jul 13 19:09:35 2013 +0900
+++ b/system/lib-admin.php	Sat Jul 13 20:40:13 2013 +0900
@@ -1049,7 +1049,7 @@
         }
         break;
         
-    case 'topic_ids':
+    case 'tid':
         $retval = TOPIC_getTopicAdminColumn('article', $A['sid']);
         break;