[Tikiwiki-cvs] tiki/lib tikilib.php,1.514.2.130,1.514.2.131

[<oh...@us...>]

Update of /cvsroot/tikiwiki/tiki/lib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11489/lib

Modified Files:
      Tag: BRANCH-1-9
	tikilib.php 
Log Message:
minor fix in list_articles, removed unused function that is available in lib/tikidate.php, too.

Index: tikilib.php
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/lib/tikilib.php,v
retrieving revision 1.514.2.130
retrieving revision 1.514.2.131
diff -u -d -r1.514.2.130 -r1.514.2.131
--- tikilib.php	22 Feb 2005 02:47:20 -0000	1.514.2.130
+++ tikilib.php	26 Feb 2005 13:58:01 -0000	1.514.2.131
@@ -2199,26 +2199,24 @@
 			$invert="!";
 		}
 	    $bindvars[]=$type;
-
 	    if ($mid) {
 		$mid .= " and `tiki_articles`.`type`$invert=? ";
 	    } else {
 		$mid = " where `tiki_articles`.`type`$invert=? ";
 	    }
 	}
-
-	if ($topicId) {
+	if (($topicId) || ($topicId=="0")) {
 		$invert="";
 		if (substr($topicId,0,1)=="!") {
 			$topicId=substr($topicId,1);
 			$invert="!";
 		}
+	    $bindvars[] = (int) $topicId;
 	    if ($mid) {
-		$mid .= " and `topicId`$invert=? ";
+		$mid .= " and `tiki_articles`.`topicId`$invert=? ";
 	    } else {
-		$mid = " where `topicId`$invert=? ";
+		$mid = " where `tiki_articles`.`topicId`$invert=? ";
 	    }
-	    $bindvars[] = (int) $topicId;
 	}
 	if ($topic) {
 		$invert="";
@@ -2228,9 +2226,9 @@
 		}
 	    $bindvars[] = $topic;
 	    if ($mid) {
-		$mid .= " and `topicName`$invert=? ";
+		$mid .= " and `tiki_articles`.`topicName`$invert=? ";
 	    } else {
-		$mid = " where `topicName`$invert=? ";
+		$mid = " where `tiki_articles`.`topicName`$invert=? ";
 	    }
 	}
 
@@ -5608,14 +5606,6 @@
 			    return $date;
 			}
 
-# TODO rename to server_time_to_site_time()
-			function get_site_time($timestamp, $user = false) {
-#print "<pre>get_site_time()</pre>";
-			    $date = $this->get_site_date($timestamp, $user);
-
-			    return $date->getTime();
-			}
-
 			function date_format($format, $timestamp, $user = false) {
 			    //$date = $this->get_site_date($timestamp, $user);
 			    // JJ - ignore conversion - we have no idea what TZ they're using