diff options
author | Dries Buytaert <dries@buytaert.net> | 2009-03-29 12:48:33 +0000 |
---|---|---|
committer | Dries Buytaert <dries@buytaert.net> | 2009-03-29 12:48:33 +0000 |
commit | a88a999ca8feb46c61da97a6c0e8df37fae588fb (patch) | |
tree | 1610aff16fc44333357fb13ef090f9ae701fb2a0 | |
parent | 95023b8c1314374d8dda9d7b8dcead5a946b12b0 (diff) | |
download | brdo-a88a999ca8feb46c61da97a6c0e8df37fae588fb.tar.gz brdo-a88a999ca8feb46c61da97a6c0e8df37fae588fb.tar.bz2 |
- Patch #351898 by mfb: database API was not E_STRICT compatible.
-rw-r--r-- | includes/database/database.inc | 4 | ||||
-rw-r--r-- | includes/database/prefetch.inc | 2 | ||||
-rw-r--r-- | includes/database/sqlite/database.inc | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/includes/database/database.inc b/includes/database/database.inc index ddffa3ce3..f07589b6f 100644 --- a/includes/database/database.inc +++ b/includes/database/database.inc @@ -1463,7 +1463,7 @@ interface DatabaseStatementInterface extends Traversable { * @return * TRUE on success, or FALSE on failure. */ - public function execute($args, $options); + public function execute($args = array(), $options = array()); /** * Get the query string of that statement. @@ -1640,7 +1640,7 @@ class DatabaseStatementBase extends PDOStatement implements DatabaseStatementInt $this->setFetchMode(PDO::FETCH_OBJ); } - public function execute($args, $options) { + public function execute($args = array(), $options = array()) { if (isset($options['fetch'])) { if (is_string($options['fetch'])) { // Default to an object. Note: db fields will be added to the object diff --git a/includes/database/prefetch.inc b/includes/database/prefetch.inc index 964256ffa..dd8f96fd7 100644 --- a/includes/database/prefetch.inc +++ b/includes/database/prefetch.inc @@ -142,7 +142,7 @@ class DatabaseStatementPrefetch implements Iterator, DatabaseStatementInterface * @return * TRUE on success, or FALSE on failure. */ - public function execute($args, $options) { + public function execute($args = array(), $options = array()) { if (isset($options['fetch'])) { if (is_string($options['fetch'])) { // Default to an object. Note: db fields will be added to the object diff --git a/includes/database/sqlite/database.inc b/includes/database/sqlite/database.inc index 93ec699cf..e872f5c3c 100644 --- a/includes/database/sqlite/database.inc +++ b/includes/database/sqlite/database.inc @@ -99,7 +99,7 @@ class DatabaseConnection_sqlite extends DatabaseConnection { * a DatabaseStatement_sqlite object, that will create a PDOStatement * using the semi-private PDOPrepare() method below. */ - public function prepare($query, array $options = array()) { + public function prepare($query, $options = array()) { return new DatabaseStatement_sqlite($this, $query, $options); } @@ -213,7 +213,7 @@ class DatabaseStatement_sqlite extends DatabaseStatementPrefetch implements Iter return $this->dbh->PDOPrepare($query); } - public function execute($args, $options) { + public function execute($args = array(), $options = array()) { try { $return = parent::execute($args, $options); } |