php7 fixes (mysqli)
This commit is contained in:
1 parent
38f7c99aa9
commit
402a7f7477
18 files changed
+169
-181
No files matched your search
@@ -5,7 +5,7 @@
|
||||
/**
|
||||
* Contains the DB_common base class
|
||||
*
|
||||
* PHP versions 4 and 5
|
||||
* PHP version 5
|
||||
*
|
||||
* LICENSE: This source file is subject to version 3.0 of the PHP license
|
||||
* that is available through the world-wide-web at the following URI:
|
||||
@@ -20,7 +20,7 @@
|
||||
* @author Daniel Convissor <danielc@php.net>
|
||||
* @copyright 1997-2007 The PHP Group
|
||||
* @license http://www.php.net/license/3_0.txt PHP License 3.0
|
||||
* @version CVS: $Id: common.php 315557 2011-08-26 14:32:35Z danielc $
|
||||
* @version CVS: $Id$
|
||||
* @link http://pear.php.net/package/DB
|
||||
*/
|
||||
|
||||
@@ -42,7 +42,7 @@ require_once 'PEAR.php';
|
||||
* @author Daniel Convissor <danielc@php.net>
|
||||
* @copyright 1997-2007 The PHP Group
|
||||
* @license http://www.php.net/license/3_0.txt PHP License 3.0
|
||||
* @version Release: 1.7.14
|
||||
* @version Release: 1.9.2
|
||||
* @link http://pear.php.net/package/DB
|
||||
*/
|
||||
class DB_common extends PEAR
|
||||
@@ -145,7 +145,7 @@ class DB_common extends PEAR
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
function DB_common()
|
||||
function __construct()
|
||||
{
|
||||
$this->PEAR('DB_Error');
|
||||
}
|
||||
@@ -261,7 +261,7 @@ class DB_common extends PEAR
|
||||
*/
|
||||
function quoteString($string)
|
||||
{
|
||||
$string = $this->quote($string);
|
||||
$string = $this->quoteSmart($string);
|
||||
if ($string{0} == "'") {
|
||||
return substr($string, 1, -1);
|
||||
}
|
||||
@@ -284,8 +284,7 @@ class DB_common extends PEAR
|
||||
*/
|
||||
function quote($string = null)
|
||||
{
|
||||
return ($string === null) ? 'NULL'
|
||||
: "'" . str_replace("'", "''", $string) . "'";
|
||||
return $this->quoteSmart($string);
|
||||
}
|
||||
|
||||
// }}}
|
||||
|
||||
Reference in new issue
Block a user