diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-10-20 14:24:15 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-10-20 14:24:15 +0200 |
| commit | c08563b6a84a1278824c5c296e50ea815e249b35 (patch) | |
| tree | 176cb2bfa00d82cf0bb43e08de955aebd5039651 | |
| parent | c6d65b051cd00828d798675e711bbea6478e5214 (diff) | |
| parent | ec5729a99f2cd4a0541817e650ec6f13ac565b6a (diff) | |
| download | forums-c08563b6a84a1278824c5c296e50ea815e249b35.tar forums-c08563b6a84a1278824c5c296e50ea815e249b35.tar.gz forums-c08563b6a84a1278824c5c296e50ea815e249b35.tar.bz2 forums-c08563b6a84a1278824c5c296e50ea815e249b35.tar.xz forums-c08563b6a84a1278824c5c296e50ea815e249b35.zip | |
Merge branch 'develop-ascraeus' into develop
| -rw-r--r-- | phpBB/viewtopic.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php index 75276d7bfc..7bedcdfb49 100644 --- a/phpBB/viewtopic.php +++ b/phpBB/viewtopic.php @@ -1248,7 +1248,7 @@ while ($row = $db->sql_fetchrow($result)) 'online' => false, 'jabber' => ($row['user_jabber'] && $auth->acl_get('u_sendim')) ? append_sid("{$phpbb_root_path}memberlist.$phpEx", "mode=contact&action=jabber&u=$poster_id") : '', - 'search' => ($auth->acl_get('u_search')) ? append_sid("{$phpbb_root_path}search.$phpEx", "author_id=$poster_id&sr=posts") : '', + 'search' => ($config['load_search'] && $auth->acl_get('u_search')) ? append_sid("{$phpbb_root_path}search.$phpEx", "author_id=$poster_id&sr=posts") : '', 'author_full' => get_username_string('full', $poster_id, $row['username'], $row['user_colour']), 'author_colour' => get_username_string('colour', $poster_id, $row['username'], $row['user_colour']), |