[Tikiwiki-cvs] tiki/lib/commcenter commlib.php,1.10,1.11

[<mo...@us...>]

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

Modified Files:
	commlib.php 
Log Message:
merge, including case-sensitivity fix

Index: commlib.php
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/lib/commcenter/commlib.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- commlib.php	17 Jul 2004 12:49:32 -0000	1.10
+++ commlib.php	29 Jul 2004 17:38:11 -0000	1.11
@@ -77,7 +77,7 @@
 	}
 
 	function rename_received_page($receivedPageId, $name) {
-		$query = "update `tiki_received_pages` set ".$this->convert_binary()." `pageName`=? where `receivedPageId`=?";
+		$query = "update `tiki_received_pages` set `pageName`=? where `receivedPageId`=?";
 		$result = $this->query($query,array($name,(int)$receivedPageId));
 	}
 
@@ -126,7 +126,7 @@
 	function receive_page($pageName, $data, $comment, $site, $user, $description) {
 		$now = date("U");
 		// Remove previous page sent from the same site-user (an update)
-		$query = "delete from `tiki_received_pages` where ".$this->convert_binary()." `pageName`=? and `receivedFromsite`=? and `receivedFromUser`=?";
+		$query = "delete from `tiki_received_pages` where `pageName`=? and `receivedFromsite`=? and `receivedFromUser`=?";
 		$result = $this->query($query,array($pageName,$site,$user));
 		// Now insert the page
 		$query = "insert into `tiki_received_pages`(`pageName`,`data`,`comment`,`receivedFromSite`, `receivedFromUser`, `receivedDate`,`description`) values(?,?,?,?,?,?,?)";