diff options
| author | Siebrand Mazeland <s.mazeland@xs4all.nl> | 2009-11-08 23:22:50 +0100 |
|---|---|---|
| committer | Siebrand Mazeland <s.mazeland@xs4all.nl> | 2009-11-08 23:22:50 +0100 |
| commit | 104a47e4a2903f1c7ea73363a73cee12f0cf14ac (patch) | |
| tree | ac68398c8b50e1eb63e43499d5c6e11cc3443dd1 /actions | |
| parent | 0ab17f382b9993ada3d12d4cdace72cca53fb545 (diff) | |
| parent | 111f6a775daf9334adb05c9f8e539d682238f4dd (diff) | |
Merge branch '0.9.x' of git://gitorious.org/statusnet/mainline into 0.9.x
Diffstat (limited to 'actions')
| -rw-r--r-- | actions/deletenotice.php | 2 | ||||
| -rw-r--r-- | actions/opensearch.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/actions/deletenotice.php b/actions/deletenotice.php index 4a48a9c34..ba8e86d0f 100644 --- a/actions/deletenotice.php +++ b/actions/deletenotice.php @@ -67,7 +67,7 @@ class DeletenoticeAction extends Action common_user_error(_('Not logged in.')); exit; } else if ($this->notice->profile_id != $this->user_profile->id && - !$this->user->hasRight(Right::deleteOthersNotice)) { + !$this->user->hasRight(Right::DELETEOTHERSNOTICE)) { common_user_error(_('Can\'t delete this notice.')); exit; } diff --git a/actions/opensearch.php b/actions/opensearch.php index b2186f0e9..8ebb5fc82 100644 --- a/actions/opensearch.php +++ b/actions/opensearch.php @@ -75,7 +75,7 @@ class OpensearchAction extends Action $this->element('Url', array('type' => 'text/html', 'method' => 'get', 'template' => str_replace('---', '{searchTerms}', common_local_url($type, array('q' => '---'))))); $this->element('Image', array('height' => 16, 'width' => 16, 'type' => 'image/vnd.microsoft.icon'), common_path('favicon.ico')); - $this->element('Image', array('height' => 50, 'width' => 50, 'type' => 'image/png'), theme_path('logo.png')); + $this->element('Image', array('height' => 50, 'width' => 50, 'type' => 'image/png'), Theme::path('logo.png')); $this->element('AdultContent', null, 'false'); $this->element('Language', null, common_language()); $this->element('OutputEncoding', null, 'UTF-8'); |