[geeklog-hg] geeklog: Fixed incorrect initialization of the global variable $...

[geeklog-cvs at lists.geeklog.net]

changeset 9180:ceb01674a2f5
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/ceb01674a2f5
user: dengen <taharaxp at gmail.com>
date: Sat Jul 13 14:39:03 2013 +0900
description:
Fixed incorrect initialization of the global variable $topic (bug #0001657)

diffstat:

 public_html/lib-common.php |  38 +++++++++++++++++++-------------------
 1 files changed, 19 insertions(+), 19 deletions(-)

diffs (55 lines):

diff -r 40860ec1da4b -r ceb01674a2f5 public_html/lib-common.php
--- a/public_html/lib-common.php	Thu Jul 11 19:34:14 2013 -0400
+++ b/public_html/lib-common.php	Sat Jul 13 14:39:03 2013 +0900
@@ -221,25 +221,6 @@
 require_once( $_CONF['path_system'] . 'lib-topic.php' );
 
 /**
-* Retrieve new topic if found
-*
-*/
-
-if (isset($_GET['topic'])) {
-    $topic = COM_applyFilter($_GET['topic']);
-} elseif (isset($_POST['topic'])) {
-    $topic = COM_applyFilter($_POST['topic']);
-} else {
-    $topic = '';
-}
-// See if user has access to view topic
-if ($topic != '') {
-    if ($topic != DB_getItem($_TABLES['topics'], 'tid', "tid = '$topic' " . COM_getPermSQL('AND'))) {
-        $topic = '';
-    }
-}
-
-/**
 * This is the block library used to manage blocks.
 *
 */
@@ -280,6 +261,25 @@
 }
 
 /**
+* Retrieve new topic if found
+*
+*/
+
+if (isset($_GET['topic'])) {
+    $topic = COM_applyFilter($_GET['topic']);
+} elseif (isset($_POST['topic'])) {
+    $topic = COM_applyFilter($_POST['topic']);
+} else {
+    $topic = '';
+}
+// See if user has access to view topic
+if ($topic != '') {
+    if ($topic != DB_getItem($_TABLES['topics'], 'tid', "tid = '$topic' " . COM_getPermSQL('AND'))) {
+        $topic = '';
+    }
+}
+
+/**
 * Multibyte functions
 *
 */