mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-02 23:07:39 +02:00
Code Issues Releases Wiki Activity

Merge branch 'develop-ascraeus' into develop

Browse Source 
* develop-ascraeus:
  [ticket/12758] Add @changed to doc block
  [ticket/12758] Add show_results var to core.search_modify_rowset
This commit is contained in:
Joas Schilling
2014-06-22 20:42:19 +02:00
parent a474d849fc b41a730471
commit 8a4c50d4b1
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
phpBB/search.php
View File

@@ -923,16 +923,19 @@ if ($keywords || $author || $author_id || $search_id || $submit)
* @var array attachments Array with posts attachments data * @var array attachments Array with posts attachments data
* @var string hilit String to highlight * @var string hilit String to highlight
* @var array rowset Array with the search results data * @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 array topic_tracking_info Array with the topics tracking data
* @var string u_hilit Highlight string to be injected into URL * @var string u_hilit Highlight string to be injected into URL
* @var string view Search results view mode * @var string view Search results view mode
* @var array zebra Array with zebra data for the current user * @var array zebra Array with zebra data for the current user
* @since 3.1.0-b4 * @since 3.1.0-b4
* @changed 3.1.0-b5 Added var show_results
*/ */
$vars = array( $vars = array(
'attachments', 'attachments',
'hilit', 'hilit',
'rowset', 'rowset',
'show_results',
'topic_tracking_info', 'topic_tracking_info',
'u_hilit', 'u_hilit',
'view', 'view',