diff options
| author | Angie Byron <webchick@24967.no-reply.drupal.org> | 2008-11-07 07:11:22 +0000 |
|---|---|---|
| committer | Angie Byron <webchick@24967.no-reply.drupal.org> | 2008-11-07 07:11:22 +0000 |
| commit | a8576b12f34cfb09d0a94d920d0effb35fab3c03 (patch) | |
| tree | eae9f30c41cf67c4dbfce5a96ce0f2e92236fe2c | |
| parent | 8a0ee80de6dc48c449f7f7deae2420d72702bdcf (diff) | |
| download | brdo-a8576b12f34cfb09d0a94d920d0effb35fab3c03.tar.gz brdo-a8576b12f34cfb09d0a94d920d0effb35fab3c03.tar.bz2 | |
#321828 by Damien Tournoud: November Make-All-Tests-Pass-Again-Extravaganza: Correct registration of maintenance page in hook_theme().
| -rw-r--r-- | includes/common.inc | 2 | ||||
| -rw-r--r-- | modules/aggregator/aggregator.admin.inc | 3 | ||||
| -rw-r--r-- | modules/aggregator/aggregator.test | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/includes/common.inc b/includes/common.inc index 34b40fbac..b032b893d 100644 --- a/includes/common.inc +++ b/includes/common.inc @@ -3069,6 +3069,8 @@ function drupal_common_theme() { 'maintenance_page' => array( 'arguments' => array('content' => NULL, 'show_blocks' => TRUE, 'show_messages' => TRUE), 'template' => 'maintenance-page', + 'path' => 'includes', + 'file' => 'theme.maintenance.inc', ), 'update_page' => array( 'arguments' => array('content' => NULL, 'show_messages' => TRUE), diff --git a/modules/aggregator/aggregator.admin.inc b/modules/aggregator/aggregator.admin.inc index c7012598c..32e0cc12d 100644 --- a/modules/aggregator/aggregator.admin.inc +++ b/modules/aggregator/aggregator.admin.inc @@ -361,7 +361,8 @@ function _aggregator_parse_opml($opml) { if ($entry['tag'] == 'OUTLINE' && isset($entry['attributes'])) { $item = $entry['attributes']; if (!empty($item['XMLURL'])) { - $feeds[] = array('title' => $item['TEXT'], 'url' => $item['XMLURL']); + $title = isset($item['TEXT']) ? $item['TEXT'] : $item['XMLURL']; + $feeds[] = array('title' => $title, 'url' => $item['XMLURL']); } } } diff --git a/modules/aggregator/aggregator.test b/modules/aggregator/aggregator.test index 11fc75dcd..fa39ecf52 100644 --- a/modules/aggregator/aggregator.test +++ b/modules/aggregator/aggregator.test @@ -585,7 +585,7 @@ class ImportOPMLTestCase extends AggregatorTestCase { $this->assertRaw(t('A feed named %title already exists.', array('%title' => $feeds[1]['title'])), t('Verifying that a duplicate title was identified')); $after = db_query('SELECT COUNT(*) FROM {aggregator_feed}')->fetchField(); - $this->assertEqual($after, 2, t('Verifying that two distinct feeds were added.')); + $this->assertEqual($after, 3, t('Verifying that three distinct feeds were added.')); $feeds_from_db = db_query("SELECT f.title, f.url, f.refresh, cf.cid FROM {aggregator_feed} f LEFT JOIN {aggregator_category_feed} cf ON f.fid = cf.fid"); $refresh = $category = TRUE; |