change the location and title of the feeds section

diff --git a/lib/action.php b/lib/action.php
index e503975147085db7200db9575dcea0da54078456..dc21c75e5a917704b2863398e39cd221c0ab1c3a 100644 (file)
--- a/lib/action.php
+++ b/lib/action.php
@@ -715,14 +715,14 @@ class Action extends HTMLOutputter // lawsuit
     {
         $this->elementStart('div', array('id' => 'aside_primary',
                                          'class' => 'aside'));
-        if (Event::handle('StartShowExportData', array($this))) {
-            $this->showExportData();
-            Event::handle('EndShowExportData', array($this));
-        }
         if (Event::handle('StartShowSections', array($this))) {
             $this->showSections();
             Event::handle('EndShowSections', array($this));
         }
+        if (Event::handle('StartShowExportData', array($this))) {
+            $this->showExportData();
+            Event::handle('EndShowExportData', array($this));
+        }
         $this->elementEnd('div');
     }
 

diff --git a/lib/feedlist.php b/lib/feedlist.php
index 9ae83f5e886e00bac74c39dcbf06579c4ea8a229..7493e3575ed6666d3fd13ad9602cede8a1314f78 100644 (file)
--- a/lib/feedlist.php
+++ b/lib/feedlist.php
@@ -61,7 +61,7 @@ class FeedList extends Widget
     {
         $this->out->elementStart('div', array('id' => 'export_data',
                                               'class' => 'section'));
-        $this->out->element('h2', null, _('Export data'));
+        $this->out->element('h2', null, _('Feeds'));
         $this->out->elementStart('ul', array('class' => 'xoxo'));
 
         foreach ($feeds as $feed) {