do some commits

[quix0rs-gnu-social.git] / actions / showstream.php

diff --git a/actions/showstream.php b/actions/showstream.php
index a9073df86a95b68ab3c4bed266ea1ce323ef3dde..d9637c377520da50621b0780c6395405ceaac8d9 100644 (file)
--- a/actions/showstream.php
+++ b/actions/showstream.php
@@ -164,7 +164,7 @@ class ShowstreamAction extends StreamAction {
                                                                          'type' => 'hidden',
                                                                          'value' => $profile->nickname));
                common_element('input', array('type' => 'submit',
-                                                                         'class' => 'button',
+                                                                         'class' => 'submit',
                                                                          'value' => _t('Subscribe')));
                common_element_end('form');
        }
@@ -182,7 +182,7 @@ class ShowstreamAction extends StreamAction {
                                                                          'id' => 'submit',
                                                                          'name' => 'submit',
                                                                          'value' => _t('Subscribe'),
-                                                                         'class' => 'button'));
+                                                                         'class' => 'submit'));
                common_element_end('form');
        }
 
@@ -194,7 +194,7 @@ class ShowstreamAction extends StreamAction {
                                                                          'type' => 'hidden',
                                                                          'value' => $profile->nickname));
                common_element('input', array('type' => 'submit',
-                                                                         'class' => 'button',
+                                                                         'class' => 'submit',
                                                                          'value' => _t('Unsubscribe')));
                common_element_end('form');
        }
@@ -204,7 +204,8 @@ class ShowstreamAction extends StreamAction {
 
                $subs = DB_DataObject::factory('subscription');
                $subs->subscriber = $profile->id;
-
+               $subs->orderBy('created DESC');
+               
                # We ask for an extra one to know if we need to do another page
 
                $subs->limit(0, SUBSCRIPTIONS + 1);
@@ -289,7 +290,7 @@ class ShowstreamAction extends StreamAction {
                common_element_end('dt');
                common_element('dd', 'subscriptions', $subs_count);
                common_element_start('dt', 'subscribers');
-               common_element('a', array('href' => common_local_url('subscribed',
+               common_element('a', array('href' => common_local_url('subscribers',
                                                                                                                         array('nickname' => $profile->nickname))),
                                           _t('Subscribers'));
                common_element_end('dt');