diff options
| author | Dries Buytaert <dries@buytaert.net> | 2009-01-11 08:36:28 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2009-01-11 08:36:28 +0000 |
| commit | 45fed79d73fc7b8bfdfe975f2fd7eba15e61c8d3 (patch) | |
| tree | 296386cf9fa4b1ac50f877d93221415ff788a9ff | |
| parent | f7cd2518fa9b5f15bc305332efb59dde76431068 (diff) | |
| download | brdo-45fed79d73fc7b8bfdfe975f2fd7eba15e61c8d3.tar.gz brdo-45fed79d73fc7b8bfdfe975f2fd7eba15e61c8d3.tar.bz2 | |
- Patch #348448 by c960657: fixed php strict warnings when running tests.
| -rw-r--r-- | includes/database/sqlite/database.inc | 2 | ||||
| -rw-r--r-- | modules/aggregator/aggregator.admin.inc | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/includes/database/sqlite/database.inc b/includes/database/sqlite/database.inc index e580e8c3f..e62ed5d1b 100644 --- a/includes/database/sqlite/database.inc +++ b/includes/database/sqlite/database.inc @@ -140,7 +140,7 @@ class DatabaseConnection_sqlite extends DatabaseConnection { return NULL; } - protected function prepareQuery($query) { + protected function prepareQuery($query, $cache = TRUE) { // It makes no sense to use the static prepared statement cache here, // because all the work in our implementation is done in // DatabaseStatement_sqlite::execute() and cannot be cached. diff --git a/modules/aggregator/aggregator.admin.inc b/modules/aggregator/aggregator.admin.inc index 9ba5285e4..afafc3b56 100644 --- a/modules/aggregator/aggregator.admin.inc +++ b/modules/aggregator/aggregator.admin.inc @@ -52,9 +52,13 @@ function aggregator_view() { * @see aggregator_form_feed_validate() * @see aggregator_form_feed_submit() */ -function aggregator_form_feed(&$form_state, $feed = NULL) { +function aggregator_form_feed(&$form_state, stdClass $feed = NULL) { $period = drupal_map_assoc(array(900, 1800, 3600, 7200, 10800, 21600, 32400, 43200, 64800, 86400, 172800, 259200, 604800, 1209600, 2419200), 'format_interval'); + if (!isset($feed)) { + $feed = new stdClass(); + } + if (empty($feed->refresh)) { $feed->refresh = 3600; } |