aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/search
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/11698] Moving all autoloadable files to phpbb/Nils Adermann2013-07-1410-5568/+0
| | | | PHPBB3-11698
* Merge remote-tracking branch 'phpbb/develop' into ticket/9657Joas Schilling2013-07-132-2/+2
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * phpbb/develop: (216 commits) [ticket/11626] Remove last reference to template in ldap [ticket/11626] Remove LDAP dependency on template [develop-olympus] Increment version number to 3.0.13-dev. [develop-olympus] Add changelog for 3.0.12 release. [develop-olympus] Bump version numbers for 3.0.12-RC1 release. [develop-olympus] Bumping version numbers to final for 3.0.12 releases. [ticket/11669] Fix PHP bug #55124 (recursive mkdir on /./) [ticket/11668] Run lint test at the end of the test suite [ticket/11548] Fix test errors in groups test on develop [ticket/11548] Check upload avatar URL the same way as in phpBB 3.0 [ticket/11548] Fix incorrect usage of array_map on acp groups page [ticket/11665] Fix test class name [ticket/11664] Stop creating php.html file in root path in tests [ticket/11665] Can't change file names already sent to set_filenames [ticket/11662] Typos: occured -> occurred [ticket/11662] Typos: occured -> occurred [ticket/11660] Fix bugs from bugs in #11651 (missing vars, db->sql_connect) [feature/auth-refactor] Add parent::setUp() in setUp() [feature/auth-refactor] Changes [feature/auth-refactor] DataProvider for acp_board test ...
| * [ticket/11662] Typos: occured -> occurredAndreas Fischer2013-07-122-2/+2
| | | | | | | | PHPBB3-11662
* | Merge remote-tracking branch 'phpbb/develop' into ↵Joas Schilling2013-07-115-14/+21
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/softdelete-1-permission * phpbb/develop: (704 commits) [ticket/11630] Improvements to the PHP lint pre-commit hook [feature/auth-refactor] Move auth providers to separate directory [ticket/11619] Use HTTP/1.0 because of lack of chunked-encoding handling. [ticket/11619] Some tests for get_remote_file(). [ticket/11617] Remove spaces and tabs from empty lines [ticket/11617] Missing U_ACTION in acp_captcha.php [feature/auth-refactor] Fix code style issue [feature/auth-refactor] Fix comment grammar [feature/auth-refactor] Fix the actual cause of test failures [ticket/10838] Fix URL for wiki and remove irrelevant line [ticket/10838] Remove php 5.4 and builtin server references [ticket/10838] Fix missing data [ticket/10838] separate database used mentioned in unit tests [ticket/11585] Make $auth_admin class property [feature/auth-refactor] A possible fix for the functional test failures [ticket/11566] Subsilver template error displayed after table headers [ticket/11566] Remove extra pair of brackets from conditional statement [ticket/11566] Check that guest doesn't have reporting permission by default [ticket/11566] Add captcha to report post template in subsilver [ticket/11566] Use the new constant CONFIRM_REPORT for captcha init ... Conflicts: phpBB/docs/sphinx.sample.conf phpBB/feed.php phpBB/styles/prosilver/template/search_results.html phpBB/styles/prosilver/template/viewforum_body.html
| * [ticket/11437] avoid $start becoming negative when no search results are foundDhruv2013-06-191-1/+1
| | | | | | | | | | | | | | | | When search returns no results there is no need to go inside the if statement. Since $result_count becomes zero, $start becomes negative which leads to failed assertion. PHPBB3-11437
| * Merge branch 'develop-olympus' into developDhruv2013-06-051-2/+9
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Andreas Fischer # Via Andreas Fischer (1) and Dhruv (1) * develop-olympus: [ticket/11583] Use a new lang key instead of giving the old one a new meaning. [ticket/11583] Allow FULLTEXT indexes on InnoDB when on MySQL 5.6.4 or higher. Conflicts: phpBB/includes/search/fulltext_mysql.php phpBB/language/en/acp/search.php
| | * [ticket/11583] Use a new lang key instead of giving the old one a new meaning.Andreas Fischer2013-06-031-1/+1
| | | | | | | | | | | | PHPBB3-11583
| | * [ticket/11583] Allow FULLTEXT indexes on InnoDB when on MySQL 5.6.4 or higher.Andreas Fischer2013-06-011-1/+8
| | | | | | | | | | | | PHPBB3-11583
| * | [ticket/11010] Fixes for number input in acpVjacheslav Trushkin2013-05-203-6/+6
| | | | | | | | | | | | PHPBB3-11010
| * | [ticket/11288] fix regex in postgresDhruv2013-05-041-1/+1
| | | | | | | | | | | | | | | | | | | | | Postgres search backend now uses updated regex being used by mysql search backend. PHPBB3-11288
| * | [ticket/11438] Add spaces after # comment start and before \ line breaksJoas Schilling2013-03-162-4/+4
| | | | | | | | | | | | PHPBB3-11438
| * | [ticket/11438] Add helpful comments from sample config to ACP outputJoas Schilling2013-03-151-3/+3
| | | | | | | | | | | | PHPBB3-11438
* | | [ticket/9657] Check for post visibility when searching with SphinxJoas Schilling2013-03-141-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | This update will require admins to manually update their Sphinx config file aswell as to delete the index and rebuild it from scratch. Before this is done the search will not be usable anymore. PHPBB3-9657
* | | [ticket/9657] FIx merge conflict from merging developJoas Schilling2013-03-052-10/+2
| | | | | | | | | | | | PHPBB3-9657
* | | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ↵Joas Schilling2013-03-035-41/+213
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/softdelete-1-permission * 'develop' of https://github.com/phpbb/phpbb3: (480 commits) [ticket/6723] Show info that message has been deleted before delivery [ticket/11385] Fix issue with migration module tool not getting extension module info [ticket/11386] Fix failing tests from constructor changes [ticket/11386] Fix circular reference error & serialize error [ticket/11386] Remove tests that check if finder cache is working [ticket/11386] Forgot to get the migration classes [ticket/11386] Update tests with new constructors for ext.manager/migrator [ticket/11386] Use finder to find migration files [ticket/11363] Fix to make get_module_infos get from all extensions [ticket/11381] Make finder able to search in all available extensions [ticket/11103] Revert whitespace changes [ticket/11103] Few more minor language things [ticket/11103] Don't call generate_board_url many times [ticket/11103] Case time in queries as an int [ticket/11103] Fix effectively installed check [ticket/11103] Remove padding from notifications for now. [ticket/11363] Fix a couple bugs and throw errors if the file not found [ticket/11372] Migrator should only check if effectively installed if not [ticket/11363] Load module info files for extensions too [ticket/11103] Notifications Migration file ... Conflicts: phpBB/includes/functions_posting.php phpBB/includes/mcp/mcp_queue.php phpBB/includes/search/fulltext_mysql.php phpBB/includes/search/fulltext_native.php phpBB/includes/search/fulltext_postgres.php phpBB/includes/search/fulltext_sphinx.php phpBB/install/database_update.php phpBB/styles/prosilver/template/ajax.js
| * | [ticket/11179] remove extra & in function callDhruv2013-02-191-1/+1
| | | | | | | | | | | | PHPBB3-11179
| * | [ticket/11179] correct start parameter in sphinx searchDhruv2013-02-191-3/+20
| | | | | | | | | | | | PHPBB3-11179
| * | [ticket/11179] correct start parameter in native author searchDhruv2013-02-191-5/+18
| | | | | | | | | | | | PHPBB3-11179
| * | [ticket/11179] correct start parameter in native keyword searchDhruv2013-02-191-9/+19
| | | | | | | | | | | | PHPBB3-11179
| * | [ticket/11179] fix success query path for postgresDhruv2013-02-191-16/+16
| | | | | | | | | | | | | | | | | | | | | Additional query to check start parameter executed only incase of no results. PHPBB3-11179
| * | [ticket/11179] fix success query path for mysqlDhruv2013-02-191-16/+16
| | | | | | | | | | | | | | | | | | | | | Additional query to check start parameter executed only incase of no results. PHPBB3-11179
| * | [ticket/11179] minor fixesDhruv2013-02-192-1/+3
| | | | | | | | | | | | | | | | | | | | | Amends comments to start with capitals. Reinsert blank lines which were not supposed to be removed PHPBB3-11179
| * | [ticket/11179] pass start param by reference in postgresDhruv2013-02-191-2/+2
| | | | | | | | | | | | PHPBB3-11179
| * | [ticket/11179] correct start param in author search of postgresDhruv2013-02-191-0/+19
| | | | | | | | | | | | PHPBB3-11179
| * | [ticket/11179] correct start parameter in psql keyword searchDhruv2013-02-191-5/+20
| | | | | | | | | | | | PHPBB3-11179
| * | [ticket/11179] pass start param by reference in author searchDhruv2013-02-191-2/+2
| | | | | | | | | | | | PHPBB3-11179
| * | [ticket/11179] correct start parameter for author searchDhruv2013-02-191-2/+21
| | | | | | | | | | | | PHPBB3-11179
| * | [ticket/11179] use FOUND_ROWS query to re-search with changed start paramDhruv2013-02-191-38/+22
| | | | | | | | | | | | PHPBB3-11179
| * | [ticket/11179] pass start parameter by referenceDhruv2013-02-192-2/+2
| | | | | | | | | | | | | | | | | | | | | start parameter is passed by reference so that in case it is not in bounds the changes made to it are reflected back to the phpBB/search.php file PHPBB3-11179
| * | [ticket/11179] correct the start parameter while retrieving from cacheDhruv2013-02-191-1/+13
| | | | | | | | | | | | | | | | | | | | | Start parameter if not between 0 and the total result count of the cached search results is changed accordingly PHPBB3-11179
| * | [ticket/11179] add search query in case initial one failsDhruv2013-02-191-2/+32
| | | | | | | | | | | | | | | | | | | | | changes the start parameter according to the total search results and executes the search query again to get the results. PHPBB3-11179
| * | [ticket/11359] html escape sphinx config dataDhruv2013-02-181-1/+1
| | | | | | | | | | | | PHPBB3-11359
| * | [ticket/11359] add id attribute to textareaDhruv2013-02-181-1/+1
| | | | | | | | | | | | PHPBB3-11359
| * | [ticket/11359] close spanDhruv2013-02-181-1/+1
| | | | | | | | | | | | PHPBB3-11359
| * | [ticket/11188] Reduce waste.Oleg Pudeyev2012-12-301-6/+8
| | | | | | | | | | | | PHPBB3-11188
| * | [ticket/11188] add result count query for author searchDhruv2012-12-301-1/+33
| | | | | | | | | | | | PHPBB3-11188
| * | [ticket/11188] add count query to postgres searchDhruv2012-12-301-1/+10
| | | | | | | | | | | | PHPBB3-11188
* | | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ↵Joas Schilling2012-12-204-10/+26
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/softdelete-1-permission-rebase * 'develop' of https://github.com/phpbb/phpbb3: (544 commits) [feature/events] Fix improperly named event in documentation [feature/events] Fix alphabetization of events [feature/events] Put events in alphabetical order [feature/events] Make EVENTS.md lowercase [ticket/11285] Use more granularity in dependency checks in compress test [ticket/10880] The m_approve permisson no longer implies f_noapprove. [ticket/10803] Show failure message until user dismisses it [ticket/10954] Add missing semi-colon [ticket/10954] Make sure to mark subforums unread and add small fixes [feature/events] Use ` to escape HTML tags in markdown [feature/events] Remove HTML tags from markdown so they don't get parsed [ticket/10954] Miscellaneous coding fixes [feature/events] Remove extraneous space [feature/events] Add markdown template event documentation file [feature/events] forumlist_body_last_post_title_after -> _prepend (subsilver2) [feature/events] Fix overall_footer_end -> overall_footer_after (subsilver2) [feature/events] Fix typo in event name [ticket/10763] Use self when calling get_extension() in filespec class [feature/events] Fix more subsilver2 events [feature/events] Fix some subsilver2 events ... Conflicts: phpBB/install/database_update.php phpBB/posting.php
| * | [ticket/11273] Add space before MiB to Sphinx "Indexer memory limit" input box.Andreas Fischer2012-12-151-1/+1
| | | | | | | | | | | | PHPBB3-11273
| * | Merge remote-tracking branch 'upstream/develop' into ticket/11015Oleg Pudeyev2012-12-062-1/+17
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/develop: (196 commits) [ticket/11219] Coding guidelines and naming consistency changes [ticket/10841] Revert more whitespace changes. [ticket/10841] Revert whitespace changes. [ticket/10841] adding space after if [ticket/10841] removing unnecessary spacing [ticket/10841] changing affectedrows check to COUNT in sql [ticket/10841] Modifying style and language selectors in UCP [ticket/11247] Fix wrong property reference in flock class. [ticket/10602] Avoid a race condition. [ticket/10602] Use last_queue_run for its intended purpose. [ticket/10716] Collect standard error from executed php process. [ticket/10716] Skip test if php is not in PATH. [ticket/10716] Exclude our dependencies from linting. [ticket/10103] New and improved wording. [ticket/10716] Only lint on php 5.3+. [ticket/10103] Assert with messages. [ticket/10103] assertLessThan/assertGreaterThan. [ticket/10103] Inline assignment is bad? [ticket/10103] $rv had too few characters. [ticket/10103] Correct flock class documentation. ... Conflicts: phpBB/includes/functions.php tests/cache/cache_test.php
| | * | [ticket/11174] include utf_tools in postgres search backendDhruv2012-11-271-0/+8
| | | | | | | | | | | | | | | | PHPBB3-11174
| | * | [ticket/11174] removes unnecessary space from wordDhruv2012-11-271-1/+1
| | | | | | | | | | | | | | | | PHPBB3-11174
| | * | [ticket/11174] include utf_tools in mysql backendDhruv2012-11-271-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | when running tests include utf_tools file in the mysql search backend PHPBB3-11174
| * | | [ticket/11015] Change more docblocks.Oleg Pudeyev2012-12-044-8/+8
| |/ / | | | | | | | | | PHPBB3-11015
* | | Merge remote-tracking branch 'remotes/phpbb/develop' into ↵Joas Schilling2012-11-104-44/+411
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/softdelete-merge-develop # By Oleg Pudeyev (45) and others # Via Oleg Pudeyev (42) and others * remotes/phpbb/develop: (289 commits) [ticket/10865] Use code tags for install/database_update.php. [ticket/10865] Should have been a slash. [ticket/10780] Use L_COLON on LDAP page. [ticket/10780] Use L_COLON on search backend ACP pages. [ticket/10780] Use L_COLON for "download all attachments". [ticket/10780] Use colon from language in ucp_pm_compose.php where possible. [ticket/10780] Replace colons in phpBB/adm/style/acp_ext_details.html. [ticket/10780] Replace colon usage in adm template output with {L_COLON} [ticket/10780] Replace colon usage in template output with {L_COLON} [ticket/11181] Bump PHP requirement to 5.3.3 (from 5.3.2) [develop-olympus] [ticket/11181] Bump PHP requirement to 5.3.3 (from 5.3.2) [ticket/10172] Show prosilver birthday list even if there are no birthdays. [ticket/11050] make all properties protected in all search backends [ticket/11050] get_common_words() returns empty array for sphinx [ticket/11050] fix tidied search query docblock language [ticket/11050] fix min/max length docblock language [ticket/11050] multi sentences separated by period in docblocks [ticket/11050] fix separated spelling in docblock [ticket/11050] fix split words doc block language [ticket/11050] remove class word from docblocks ... Conflicts: phpBB/install/database_update.php phpBB/install/schemas/mssql_schema.sql phpBB/language/en/acp/permissions_phpbb.php phpBB/styles/prosilver/template/posting_editor.html
| * | [ticket/10780] Use L_COLON on search backend ACP pages.Andreas Fischer2012-11-104-13/+13
| | | | | | | | | | | | PHPBB3-10780
| * | Merge PR #1043 branch 'dhruvgoel92/ticket/11177' into developOleg Pudeyev2012-11-091-0/+6
| |\ \ | | | | | | | | | | | | | | | | * dhruvgoel92/ticket/11177: [ticket/11177] return no results when query has only negation
| | * | [ticket/11177] return no results when query has only negationDhruv2012-11-091-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | If search query has only -foo then instead of displaying all results that do not have foo, should display no results found. PHPBB3-11177
| * | | [ticket/11050] make all properties protected in all search backendsDhruv2012-11-094-10/+10
| | | | | | | | | | | | | | | | PHPBB-11050
| * | | [ticket/11050] get_common_words() returns empty array for sphinxDhruv2012-11-091-2/+2
| | | | | | | | | | | | | | | | PHPBB-11050