Commit 45fed79d authored by Dries's avatar Dries

- Patch #348448 by c960657: fixed php strict warnings when running tests.

parent f7cd2518
......@@ -140,7 +140,7 @@ public function mapConditionOperator($operator) {
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.
......
......@@ -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;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment