diff options
| author | Evan Prodromou <evan@controlyourself.ca> | 2009-04-03 12:47:25 -0400 |
|---|---|---|
| committer | Evan Prodromou <evan@controlyourself.ca> | 2009-04-03 12:47:25 -0400 |
| commit | d68ac2e1d3319193c8ee01db4c2adf846fe4accf (patch) | |
| tree | 3651b67fff460c853c6f245ee827352273b3f6c3 | |
| parent | bd120bc3153e3502790ec976769febd41f790568 (diff) | |
| parent | 26194cd1d6dbd7ceb021b8e215e7a7ad7b29116f (diff) | |
Merge branch '0.7.x' into 0.8.x
| -rw-r--r-- | actions/remotesubscribe.php | 2 | ||||
| -rw-r--r-- | actions/sup.php | 2 | ||||
| -rw-r--r-- | lib/router.php | 3 |
3 files changed, 5 insertions, 2 deletions
diff --git a/actions/remotesubscribe.php b/actions/remotesubscribe.php index 2e721a38b..0b1174896 100644 --- a/actions/remotesubscribe.php +++ b/actions/remotesubscribe.php @@ -97,7 +97,7 @@ class RemotesubscribeAction extends Action 'class' => 'form_settings', 'action' => common_local_url('remotesubscribe'))); $this->elementStart('fieldset'); - $this->element('legend', 'Subscribe to a remote user'); + $this->element('legend', _('Subscribe to a remote user')); $this->hidden('token', common_session_token()); $this->elementStart('ul', 'form_data'); diff --git a/actions/sup.php b/actions/sup.php index 8ef9207fa..246b3299d 100644 --- a/actions/sup.php +++ b/actions/sup.php @@ -45,7 +45,7 @@ class SupAction extends Action function availablePeriods() { static $periods = array(86400, 43200, 21600, 7200, - 3600, 1800, 600, 300, 120, + 3600, 1800, 600, 300, 120, 60, 30, 15); $available = array(); foreach ($periods as $period) { diff --git a/lib/router.php b/lib/router.php index 67b8b8ae6..060253eb5 100644 --- a/lib/router.php +++ b/lib/router.php @@ -107,6 +107,9 @@ class Router $m->connect('main/'.$a, array('action' => $a)); } + $m->connect('main/sup/:seconds', array('action' => 'sup'), + array('seconds' => '[0-9]+')); + $m->connect('main/tagother/:id', array('action' => 'tagother')); // these take a code |