summaryrefslogtreecommitdiff
path: root/lib/searchaction.php
diff options
context:
space:
mode:
authorAdrian Lang <mail@adrianlang.de>2009-03-11 10:07:41 +0100
committerAdrian Lang <mail@adrianlang.de>2009-03-11 10:07:41 +0100
commit72338b8c2674b8b6de8ba2d1eafeac4f27d5af92 (patch)
tree6562a1e393c2ea9b3f4fdf901a7509b34eef863b /lib/searchaction.php
parent622cc150d86265cbb1dcd35ae11f4941d42ffdeb (diff)
parentc6cd87c106b763ed5610dae64e5a02ba86609ece (diff)
Merge branch '0.7.x' of http://git.gitorious.org/laconica/erichelgeson-clone into review/0.7.x
Diffstat (limited to 'lib/searchaction.php')
-rw-r--r--lib/searchaction.php4
1 files changed, 1 insertions, 3 deletions
diff --git a/lib/searchaction.php b/lib/searchaction.php
index df6876445..c762db16f 100644
--- a/lib/searchaction.php
+++ b/lib/searchaction.php
@@ -110,8 +110,6 @@ class SearchAction extends Action
function showForm($error=null)
{
- global $config;
-
$q = $this->trimmed('q');
$page = $this->trimmed('page', 1);
$this->elementStart('form', array('method' => 'get',
@@ -122,7 +120,7 @@ class SearchAction extends Action
$this->element('legend', null, _('Search site'));
$this->elementStart('ul', 'form_data');
$this->elementStart('li');
- if (!isset($config['site']['fancy']) || !$config['site']['fancy']) {
+ if (!common_config('site', 'fancy')) {
$this->hidden('action', $this->trimmed('action'));
}
$this->input('q', 'Keyword(s)', $q);