- Patch #351898 by mfb: database API was not E_STRICT compatible.

merge-requests/26/head
Dries Buytaert 2009-03-29 12:48:33 +00:00
parent 95023b8c13
commit a88a999ca8
3 changed files with 5 additions and 5 deletions

View File

@ -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

View File

@ -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

View File

@ -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);
}