diff -r 1633800da64c -r 609d0d469b10 common/libraries/plugin/pear/MDB2.php --- a/common/libraries/plugin/pear/MDB2.php Wed Jan 26 16:46:41 2011 +0100 +++ b/common/libraries/plugin/pear/MDB2.php Wed Jan 26 17:09:23 2011 +0100 @@ -279,7 +279,7 @@ * * @access public */ - function setOptions(&$db, $options) + static function setOptions(&$db, $options) { if (is_array($options)) { foreach ($options as $option => $value) { @@ -304,7 +304,7 @@ * @static * @access public */ - function classExists($classname) + static public function classExists($classname) { if (version_compare(phpversion(), "5.0", ">=")) { return class_exists($classname, false); @@ -325,7 +325,7 @@ * * @access public */ - function loadClass($class_name, $debug) + static function loadClass($class_name, $debug) { if (!MDB2::classExists($class_name)) { $file_name = str_replace('_', DIRECTORY_SEPARATOR, $class_name).'.php'; @@ -374,7 +374,7 @@ * * @access public */ - function &factory($dsn, $options = false) + static function &factory($dsn, $options = false) { $dsninfo = MDB2::parseDSN($dsn); if (empty($dsninfo['phptype'])) { @@ -431,7 +431,7 @@ * @access public * @see MDB2::parseDSN */ - function &connect($dsn, $options = false) + static function &connect($dsn, $options = false) { $db =& MDB2::factory($dsn, $options); if (PEAR::isError($db)) { @@ -625,7 +625,7 @@ * * @access public */ - function isError($data, $code = null) + static function isError($data, $code = null) { if (is_a($data, 'MDB2_Error')) { if (is_null($code)) { @@ -686,7 +686,7 @@ * * @access public */ - function isResultCommon($value) + static function isResultCommon($value) { return is_a($value, 'MDB2_Result_Common'); } @@ -824,7 +824,7 @@ * @access public * @author Tomas V.V.Cox */ - function parseDSN($dsn) + static function parseDSN($dsn) { $parsed = $GLOBALS['_MDB2_dsninfo_default']; @@ -2094,7 +2094,7 @@ * @access public * @since 2.1.1 */ - function setTransactionIsolation($isolation, $options = array()) + static function setTransactionIsolation($isolation, $options = array()) { $this->debug('Setting transaction isolation level', __FUNCTION__, array('is_manip' => true)); return $this->raiseError(MDB2_ERROR_UNSUPPORTED, null, null, diff -r 1633800da64c -r 609d0d469b10 common/libraries/plugin/pear/MDB2/Driver/ibase.php --- a/common/libraries/plugin/pear/MDB2/Driver/ibase.php Wed Jan 26 16:46:41 2011 +0100 +++ b/common/libraries/plugin/pear/MDB2/Driver/ibase.php Wed Jan 26 17:09:23 2011 +0100 @@ -393,7 +393,7 @@ * @access public * @since 2.1.1 */ - function setTransactionIsolation($isolation, $options = array()) + static function setTransactionIsolation($isolation, $options = array()) { $this->debug('Setting transaction isolation level', __FUNCTION__, array('is_manip' => true)); switch ($isolation) { diff -r 1633800da64c -r 609d0d469b10 common/libraries/plugin/pear/MDB2/Driver/mysql.php --- a/common/libraries/plugin/pear/MDB2/Driver/mysql.php Wed Jan 26 16:46:41 2011 +0100 +++ b/common/libraries/plugin/pear/MDB2/Driver/mysql.php Wed Jan 26 17:09:23 2011 +0100 @@ -462,7 +462,7 @@ * @access public * @since 2.1.1 */ - function setTransactionIsolation($isolation) + static function setTransactionIsolation($isolation) { $this->debug('Setting transaction isolation level', __FUNCTION__, array('is_manip' => true)); if (!$this->supports('transactions')) { diff -r 1633800da64c -r 609d0d469b10 common/libraries/plugin/pear/MDB2/Driver/mysqli.php --- a/common/libraries/plugin/pear/MDB2/Driver/mysqli.php Wed Jan 26 16:46:41 2011 +0100 +++ b/common/libraries/plugin/pear/MDB2/Driver/mysqli.php Wed Jan 26 17:09:23 2011 +0100 @@ -459,7 +459,7 @@ * @access public * @since 2.1.1 */ - function setTransactionIsolation($isolation) + static function setTransactionIsolation($isolation, $options = array()) { $this->debug('Setting transaction isolation level', __FUNCTION__, array('is_manip' => true)); if (!$this->supports('transactions')) { diff -r 1633800da64c -r 609d0d469b10 common/libraries/plugin/pear/MDB2/Driver/oci8.php --- a/common/libraries/plugin/pear/MDB2/Driver/oci8.php Wed Jan 26 16:46:41 2011 +0100 +++ b/common/libraries/plugin/pear/MDB2/Driver/oci8.php Wed Jan 26 17:09:23 2011 +0100 @@ -291,7 +291,7 @@ * @access public * @since 2.1.1 */ - function setTransactionIsolation($isolation) + static function setTransactionIsolation($isolation) { $this->debug('Setting transaction isolation level', __FUNCTION__, array('is_manip' => true)); switch ($isolation) { diff -r 1633800da64c -r 609d0d469b10 common/libraries/plugin/pear/MDB2/Driver/pgsql.php --- a/common/libraries/plugin/pear/MDB2/Driver/pgsql.php Wed Jan 26 16:46:41 2011 +0100 +++ b/common/libraries/plugin/pear/MDB2/Driver/pgsql.php Wed Jan 26 17:09:23 2011 +0100 @@ -343,7 +343,7 @@ * @access public * @since 2.1.1 */ - function setTransactionIsolation($isolation) + static function setTransactionIsolation($isolation) { $this->debug('Setting transaction isolation level', __FUNCTION__, array('is_manip' => true)); switch ($isolation) { diff -r 1633800da64c -r 609d0d469b10 common/libraries/plugin/pear/MDB2/Driver/sqlite.php --- a/common/libraries/plugin/pear/MDB2/Driver/sqlite.php Wed Jan 26 16:46:41 2011 +0100 +++ b/common/libraries/plugin/pear/MDB2/Driver/sqlite.php Wed Jan 26 17:09:23 2011 +0100 @@ -299,7 +299,7 @@ * @access public * @since 2.1.1 */ - function setTransactionIsolation($isolation) + static function setTransactionIsolation($isolation) { $this->debug('Setting transaction isolation level', __FUNCTION__, array('is_manip' => true)); switch ($isolation) { diff -r 1633800da64c -r 609d0d469b10 common/libraries/plugin/pear/PEAR.php --- a/common/libraries/plugin/pear/PEAR.php Wed Jan 26 16:46:41 2011 +0100 +++ b/common/libraries/plugin/pear/PEAR.php Wed Jan 26 17:09:23 2011 +0100 @@ -276,7 +276,7 @@ * @access public * @return bool true if parameter is an error */ - function isError($data, $code = null) + static function isError($data, $code = null) { if (is_a($data, 'PEAR_Error')) { if (is_null($code)) {