Index: modules/aggregator/aggregator.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/aggregator/aggregator.admin.inc,v
retrieving revision 1.22
diff -u -9 -p -r1.22 aggregator.admin.inc
--- modules/aggregator/aggregator.admin.inc	22 Dec 2008 19:38:30 -0000	1.22
+++ modules/aggregator/aggregator.admin.inc	10 Jan 2009 23:23:39 -0000
@@ -46,21 +46,25 @@ function aggregator_view() {
 }
 
 /**
  * Form builder; Generate a form to add/edit feed sources.
  *
  * @ingroup forms
  * @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;
   }
 
   $form['title'] = array('#type' => 'textfield',
     '#title' => t('Title'),
     '#default_value' => isset($feed->title) ? $feed->title : '',
     '#maxlength' => 255,
     '#description' => t('The name of the feed (or the name of the website providing the feed).'),
Index: includes/database/sqlite/database.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/database/sqlite/database.inc,v
retrieving revision 1.8
diff -u -9 -p -r1.8 database.inc
--- includes/database/sqlite/database.inc	9 Dec 2008 11:22:11 -0000	1.8
+++ includes/database/sqlite/database.inc	10 Jan 2009 23:23:40 -0000
@@ -134,19 +134,19 @@ class DatabaseConnection_sqlite extends 
   public function databaseType() {
     return 'sqlite';
   }
 
   public function mapConditionOperator($operator) {
     // We don't want to override any of the defaults.
     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.
     return $this->prepare($this->prefixTables($query));
   }
 
   /**
    * @todo Remove this as soon as db_rewrite_sql() has been exterminated.
    */