Merge branch 'master' into feature/url-routing

Geeklog-Core · Jan 31, 2016 · 3edf938 · 3edf938
2 parents 4929895 + 7115aad
commit 3edf938
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/public_html/admin/topic.php b/public_html/admin/topic.php
@@ -756,7 +756,7 @@ function deleteTopic ($tid)
     foreach ($object_tables as $object_table) {
         $sql = "SELECT {$object_tables_id[$object_table]}, ta.tdefault
             FROM $object_table, {$_TABLES['topic_assignments']} ta
-            WHERE ta.type = '{$object_type[$object_table]}' AND ta.id = CAST({$object_tables_id[$object_table]} AS VARCHAR) AND ta.tid = '$tid'";
+            WHERE ta.type = '{$object_type[$object_table]}' AND ta.id = CAST({$object_tables_id[$object_table]} AS CHAR) AND ta.tid = '$tid'";
         $result = DB_query ($sql);
         $numStories = DB_numRows($result);
         for ($i = 0; $i < $numStories; $i++) {

diff --git a/public_html/admin/user.php b/public_html/admin/user.php
@@ -824,7 +824,7 @@ function batchdelete()
             $header_arr[] = array('text' => $LANG28[41], 'field' => 'lastlogin_short', 'sort' => true);
             $header_arr[] = array('text' => $LANG28[67], 'field' => 'phantom_date', 'sort' => true);
             $list_sql = ", UNIX_TIMESTAMP()- UNIX_TIMESTAMP(regdate) as phantom_date";
-            $filter_sql = "lastlogin = CAST(0 AS VARCHAR) AND UNIX_TIMESTAMP()- UNIX_TIMESTAMP(regdate) > " . ($usr_time * 2592000) . " AND";
+            $filter_sql = "lastlogin = CAST(0 AS CHAR) AND UNIX_TIMESTAMP()- UNIX_TIMESTAMP(regdate) > " . ($usr_time * 2592000) . " AND";
             $sort = 'regdate';
             break;
         case 'short':
@@ -833,15 +833,15 @@ function batchdelete()
             $header_arr[] = array('text' => $LANG28[68], 'field' => 'online_hours', 'sort' => true);
             $header_arr[] = array('text' => $LANG28[69], 'field' => 'offline_months', 'sort' => true);
             $list_sql = ", (lastlogin - UNIX_TIMESTAMP(regdate)) AS online_hours, (UNIX_TIMESTAMP() - lastlogin) AS offline_months";
-            $filter_sql = "lastlogin > CAST(0 AS VARCHAR) AND lastlogin - UNIX_TIMESTAMP(regdate) < 86400 "
+            $filter_sql = "lastlogin > CAST(0 AS CHAR) AND lastlogin - UNIX_TIMESTAMP(regdate) < 86400 "
                          . "AND UNIX_TIMESTAMP() - lastlogin > " . ($usr_time * 2592000) . " AND";
             $sort = 'lastlogin';
             break;
         case 'old':
             $header_arr[] = array('text' => $LANG28[41], 'field' => 'lastlogin_short', 'sort' => true);
             $header_arr[] = array('text' => $LANG28[69], 'field' => 'offline_months', 'sort' => true);
             $list_sql = ", (UNIX_TIMESTAMP() - lastlogin) AS offline_months";
-            $filter_sql = "lastlogin > CAST(0 AS VARCHAR) AND (UNIX_TIMESTAMP() - lastlogin) > " . ($usr_time * 2592000) . " AND";
+            $filter_sql = "lastlogin > CAST(0 AS CHAR) AND (UNIX_TIMESTAMP() - lastlogin) > " . ($usr_time * 2592000) . " AND";
             $sort = 'lastlogin';
             break;
         case 'recent':