[PC-BSD Commits] r2295 - in websites: bsdstats.org/bsdstats/sbin/cache pbidir.com/bibivu/sbin/cache pbidir.com/bibivu/slib/db

[svn at pcbsd.org]

Author: fabry
Date: 2008-07-08 10:52:49 -0700 (Tue, 08 Jul 2008)
New Revision: 2295

Modified:
   websites/bsdstats.org/bsdstats/sbin/cache/memcached.php
   websites/pbidir.com/bibivu/sbin/cache/memcached.php
   websites/pbidir.com/bibivu/slib/db/pgsql.php
Log:
fixed a memcached problem when trying to compress

Modified: websites/bsdstats.org/bsdstats/sbin/cache/memcached.php
===================================================================
--- websites/bsdstats.org/bsdstats/sbin/cache/memcached.php	2008-07-08 13:49:24 UTC (rev 2294)
+++ websites/bsdstats.org/bsdstats/sbin/cache/memcached.php	2008-07-08 17:52:49 UTC (rev 2295)
@@ -138,7 +138,7 @@
 		$con = $this->_getConForKey($key);
 		if ($con === false) return false;
 		$this->numSet++;
-		$return = $con->set($key, $var, $compress, $expire);
+		$return = $con->set($key, $var, $compress?MEMCACHE_COMPRESSED:false,, $expire);
 			$time2=$this->getmicrotime();
 			$this->total_time += $time2-$time1;
 		return $return;

Modified: websites/pbidir.com/bibivu/sbin/cache/memcached.php
===================================================================
--- websites/pbidir.com/bibivu/sbin/cache/memcached.php	2008-07-08 13:49:24 UTC (rev 2294)
+++ websites/pbidir.com/bibivu/sbin/cache/memcached.php	2008-07-08 17:52:49 UTC (rev 2295)
@@ -138,7 +138,7 @@
 		$con = $this->_getConForKey($key);
 		if ($con === false) return false;
 		$this->numSet++;
-		$return = $con->set($key, $var, $compress, $expire);
+		$return = $con->set($key, $var, $compress?MEMCACHE_COMPRESSED:false, $expire);
 			$time2=$this->getmicrotime();
 			$this->total_time += $time2-$time1;
 		return $return;

Modified: websites/pbidir.com/bibivu/slib/db/pgsql.php
===================================================================
--- websites/pbidir.com/bibivu/slib/db/pgsql.php	2008-07-08 13:49:24 UTC (rev 2294)
+++ websites/pbidir.com/bibivu/slib/db/pgsql.php	2008-07-08 17:52:49 UTC (rev 2295)
@@ -355,7 +355,7 @@
 			$this->connect($this->persistant,true);
 		}
 		if($string!='' && $this->link_id){
-			$return = pg_escape_string($string,$this->link_id);
+			$return = pg_escape_string($this->link_id,$string);
 		} else {
 			$return =$string;
 		}
@@ -374,7 +374,7 @@
 		// only once per session or every 15 minutes
 		
 		if($this->link_id){
-			$this->errdesc=pg_last_error($this->link_id);
+			$this->errdesc=pg_result_error($this->link_id);
 			$this->errno=0;
 		} else {
 			//no connection, just gettin the last error from Pgsql