diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-06-22 20:42:19 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-06-22 20:42:19 +0200 |
| commit | 8a4c50d4b1f726a9b1888a4b612ff2854bbdf8c0 (patch) | |
| tree | 20e48628b160e35de9c0a95e72daddee081c68bc | |
| parent | a474d849fcdf12f83456c9cabb5c8e90e6186e71 (diff) | |
| parent | b41a730471f2fad7a2466688d323c5563848c640 (diff) | |
| download | forums-8a4c50d4b1f726a9b1888a4b612ff2854bbdf8c0.tar forums-8a4c50d4b1f726a9b1888a4b612ff2854bbdf8c0.tar.gz forums-8a4c50d4b1f726a9b1888a4b612ff2854bbdf8c0.tar.bz2 forums-8a4c50d4b1f726a9b1888a4b612ff2854bbdf8c0.tar.xz forums-8a4c50d4b1f726a9b1888a4b612ff2854bbdf8c0.zip | |
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
[ticket/12758] Add @changed to doc block
[ticket/12758] Add show_results var to core.search_modify_rowset
| -rw-r--r-- | phpBB/search.php | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/phpBB/search.php b/phpBB/search.php index f1f02ac766..c01fcfede7 100644 --- a/phpBB/search.php +++ b/phpBB/search.php @@ -923,16 +923,19 @@ if ($keywords || $author || $author_id || $search_id || $submit) * @var array attachments Array with posts attachments data * @var string hilit String to highlight * @var array rowset Array with the search results data + * @var string show_results String indicating the show results mode * @var array topic_tracking_info Array with the topics tracking data * @var string u_hilit Highlight string to be injected into URL * @var string view Search results view mode * @var array zebra Array with zebra data for the current user * @since 3.1.0-b4 + * @changed 3.1.0-b5 Added var show_results */ $vars = array( 'attachments', 'hilit', 'rowset', + 'show_results', 'topic_tracking_info', 'u_hilit', 'view', |