Changeset 8222 for sandbox/2.5.1-evolucao/phpgwapi/inc/adodb/adodb-pager.inc.php

Timestamp:

09/26/13 15:41:49 (11 years ago)

Author:

angelo

Message:

Ticket #3491 - Compatibilizar Expresso com novas versoes do PHP

File:

• sandbox/2.5.1-evolucao/phpgwapi/inc/adodb/adodb-pager.inc.php (modified) (3 diffs)

sandbox/2.5.1-evolucao/phpgwapi/inc/adodb/adodb-pager.inc.php

@@ -2 +2 @@
 
 /*
-        V4.94 23 Jan 2007  (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights reserved.
+        V5.18 3 Sep 2012   (c) 2000-2012 John Lim (jlim#natsoft.com). All rights reserved.
           Released under both BSD license and Lesser GPL library license. 
           Whenever there is any discrepancy between the two licenses, 
@@ -61 +61 @@
         
                 $curr_page = $id.'_curr_page';
-                if (empty($PHP_SELF)) $PHP_SELF = htmlspecialchars($_SERVER['PHP_SELF']); // htmlspecialchars() to prevent XSS attacks
+                if (!empty($PHP_SELF)) $PHP_SELF = htmlspecialchars($_SERVER['PHP_SELF']); // htmlspecialchars() to prevent XSS attacks
                 
                 $this->sql = $sql;
@@ -248 +248 @@
                 if ($this->db->pageExecuteCountRows) $ADODB_COUNTRECS = true;
                 if ($this->cache)
-                        $rs = &$this->db->CachePageExecute($this->cache,$this->sql,$rows,$this->curr_page);
+                        $rs = $this->db->CachePageExecute($this->cache,$this->sql,$rows,$this->curr_page);
                 else
-                        $rs = &$this->db->PageExecute($this->sql,$rows,$this->curr_page);
+                        $rs = $this->db->PageExecute($this->sql,$rows,$this->curr_page);
                 $ADODB_COUNTRECS = $savec;
                 
-                $this->rs = &$rs;
+                $this->rs = $rs;
                 if (!$rs) {
                         print "<h3>Query failed: $this->sql</h3>";