aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'dhruvgoel92/ticket/11052' into developDavid King2012-08-154-7/+7
|\
| * [ticket/11052] update search backend constructor everywhereDhruv2012-08-154-7/+7
| | | | | | | | PHPBB3-11052
* | Merge remote-tracking branch 'dhruvgoel92/ticket/11052' into developDavid King2012-08-151-1/+1
|\ \ | |/
| * [ticket/11052] pass parametes to search construct while postingDhruv2012-08-151-1/+1
| | | | | | | | | | | | | | Proper parameters are passed in search backend constructor in functions_posting.php PHPBB3-11052
* | [ticket/11054] Fixed $config var descriptionDavid King2012-08-151-2/+2
| | | | | | | | PHPBB3-11054
* | [ticket/11054] The user class is phpbb_userDavid King2012-08-141-1/+1
| | | | | | | | PHPBB3-11054
* | [ticket/11054] Fixed documentation syntax for @var in extension/controller.phpDavid King2012-08-141-7/+14
|/ | | | PHPBB3-11054
* Merge remote-tracking branch 'dhruvgoel92/ticket/11048' into developAndreas Fischer2012-08-144-197/+95
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | * dhruvgoel92/ticket/11048: [ticket/11048] use protected instead of private in pgsql fulltext [ticket/11048] use protected instead of private in native search [ticket/11048] remove @access from all docblocks [ticket/11048] use protected instead of private in mysql fulltext [ticket/11048] use protected instead of private in sphinx [ticket/11048] add access specifiers to phpbb native search properties [ticket/11048] add access specifiers to sphinx search [ticket/11048] add access specifiers to phpbb native search [ticket/11048] add access specifiers to mysql search [ticket/11048] add access specifiers to pgsql search
| * [ticket/11048] use protected instead of private in pgsql fulltextDhruv2012-08-141-10/+10
| | | | | | | | PHPBB3-11048
| * [ticket/11048] use protected instead of private in native searchDhruv2012-08-141-11/+11
| | | | | | | | PHPBB3-11048
| * [ticket/11048] remove @access from all docblocksDhruv2012-08-141-10/+0
| | | | | | | | PHPBB3-11048
| * [ticket/11048] use protected instead of private in mysql fulltextDhruv2012-08-141-6/+6
| | | | | | | | PHPBB3-11048
| * [ticket/11048] use protected instead of private in sphinxDhruv2012-08-141-16/+16
| | | | | | | | PHPBB3-11048
| * [ticket/11048] add access specifiers to phpbb native search propertiesDhruv2012-08-101-8/+8
| | | | | | | | PHPBB3-11048
| * [ticket/11048] add access specifiers to sphinx searchDhruv2012-08-101-44/+14
| | | | | | | | PHPBB3-11048
| * [ticket/11048] add access specifiers to phpbb native searchDhruv2012-08-101-13/+13
| | | | | | | | PHPBB3-11048
| * [ticket/11048] add access specifiers to mysql searchDhruv2012-08-101-44/+14
| | | | | | | | PHPBB3-11048
| * [ticket/11048] add access specifiers to pgsql searchDhruv2012-08-101-46/+14
| | | | | | | | PHPBB3-11048
* | Merge pull request #932 from EXreaction/ticket/10875Nils Adermann2012-08-1414-39/+43
|\ \ | | | | | | Ticket/10875
| * | [ticket/10875] Return $query_id from sql_saveNathan Guse2012-08-0611-9/+13
| | | | | | | | | | | | | | | | | | | | | | | | Have to return the $query_id from sql_save so that the results can be pulled Updated cache test to do some basic sql cache testing. PHPBB3-10875
| * | [ticket/10875] Fix SQL CachingNathan Guse2012-07-3014-30/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The sql_save function cannot take arguments by reference since it is called by call_user_func_array() Replace use of isset($cache->sql_rowset[$query_id]) with $cache->sql_exists Replace $cache->cache_dir with $cache->get_driver()->cache_dir PHPBB3-10875
* | | [ticket/11032] sphinx retries before triggering errorDhruv2012-08-111-9/+9
| | | | | | | | | | | | | | | | | | Sphinx connection retries should be done before error is triggered. PHPBB3-11032
* | | [ticket/11032] trigger error in case search failsDhruv2012-08-101-0/+8
| |/ |/| | | | | | | | | | | Admins are shown actual error while users are shown a search failed error in case sphinx search fails. PHPBB3-11032
* | Merge PR #916 branch 'dhruvgoel92/ticket/11011' into developOleg Pudeyev2012-08-085-317/+313
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * dhruvgoel92/ticket/11011: [ticket/11011] rename property phpEx to php_ext [ticket/11011] pass $auth to search backend constructor [ticket/11011] remove global keyword from sphinx [ticket/11011] pass global variables in construct [ticket/11011] passing global variables [ticket/11011] remove global keyword in native search [ticket/11011] remove global keyword in pgsql search [ticket/11011] global variables as constructor parameters [ticket/11011] add access specifiers and docblocks
| * | [ticket/11011] rename property phpEx to php_extDhruv2012-08-082-9/+9
| | | | | | | | | | | | PHPBB3-11011
| * | [ticket/11011] pass $auth to search backend constructorDhruv2012-08-085-6/+6
| | | | | | | | | | | | | | | | | | | | | $auth global var is passed to search backend constructor, as it is used by sphinx backend. PHPBB3-11011
| * | [ticket/11011] remove global keyword from sphinxDhruv2012-07-281-7/+6
| | | | | | | | | | | | PHPBB3-11011
| * | [ticket/11011] pass global variables in constructDhruv2012-07-281-6/+7
| | | | | | | | | | | | | | | | | | | | | Use global variables passed through constructor instead of using global keyword in sphinx search backend. PHPBB3-11011
| * | [ticket/11011] passing global variablesDhruv2012-07-282-6/+2
| | | | | | | | | | | | | | | | | | Pass global variables to class constructor when making a new object. PHPBB3-11011
| * | [ticket/11011] remove global keyword in native searchDhruv2012-07-281-142/+132
| | | | | | | | | | | | | | | | | | Pass global variables into the search backend class constructor. PHPBB3-11011
| * | [ticket/11011] remove global keyword in pgsql searchDhruv2012-07-281-77/+57
| | | | | | | | | | | | | | | | | | Pass global variables into the search backend class constructor. PHPBB3-11011
| * | [ticket/11011] global variables as constructor parametersDhruv2012-07-281-77/+58
| | | | | | | | | | | | | | | | | | Pass global variables into the search backend class constructor. PHPBB3-11011
| * | [ticket/11011] add access specifiers and docblocksDhruv2012-07-281-6/+55
| | | | | | | | | | | | | | | | | | Add access specifiers and docblocks to mysql search backend. PHPBB3-11011
* | | Merge PR #933 branch 'dhruvgoel92/ticket/11032' into developOleg Pudeyev2012-08-081-1/+6
|\ \ \ | | | | | | | | | | | | | | | | | | | | * dhruvgoel92/ticket/11032: [ticket/11032] use method GetLastError to get error [ticket/11032] add sphinx errors to error log
| * | | [ticket/11032] use method GetLastError to get errorDhruv2012-08-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of using _error property, use method GetLastError to retrieve the error as sphinx API documentation states. PHPBB3-11032
| * | | [ticket/11032] add sphinx errors to error logDhruv2012-08-011-0/+5
| | |/ | |/| | | | | | | PHPBB3-11032
* | | Merge remote-tracking branch 'Noxwizard/ticket/11043' into developAndreas Fischer2012-08-071-5/+6
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * Noxwizard/ticket/11043: [ticket/11043] Change hook name back to display, since that's where we hook in. [ticket/11043] Allow call_hook() to be called from more than one location. [ticket/11043] Update template hook name
| * | | [ticket/11043] Allow call_hook() to be called from more than one location.Andreas Fischer2012-08-031-5/+6
| |/ / | | | | | | | | | | | | | | | | | | | | | Allow the helper function call_hook() of class phpbb_template to be called from more than once location and thus for more than one hook (although there is only one) by adding the method name as a parameter. PHPBB3-11043
* | | Merge remote-tracking branch 'Fyorl/ticket/11044' into developAndreas Fischer2012-08-061-0/+37
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fyorl/ticket/11044: [ticket/11044] Added comment explaining filename splitting [ticket/11044] Preserve the file extension in unique filenames [ticket/11044] Minor adjustments as per PR comments [ticket/11044] Compress class now deals with file conflicts
| * | | [ticket/11044] Added comment explaining filename splittingFyorl2012-08-061-1/+4
| | | | | | | | | | | | | | | | PHPBB3-11044
| * | | [ticket/11044] Preserve the file extension in unique filenamesFyorl2012-08-051-1/+9
| | | | | | | | | | | | | | | | PHPBB3-11044
| * | | [ticket/11044] Minor adjustments as per PR commentsFyorl2012-08-051-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | Changed private to protected, renamed check_name to unique_filename. PHPBB3-11044
| * | | [ticket/11044] Compress class now deals with file conflictsFyorl2012-08-041-0/+25
| |/ / | | | | | | | | | PHPBB3-11044
* | | Merge remote-tracking branch 'bantu/ticket/11041' into developIgor Wiedler2012-08-062-5/+5
|\ \ \ | | | | | | | | | | | | | | | | * bantu/ticket/11041: [ticket/11041] Correctly import PHP file extension from global space.
| * | | [ticket/11041] Correctly import PHP file extension from global space.Andreas Fischer2012-08-022-5/+5
| |/ / | | | | | | | | | | | | | | | | | | 85bcdbad468cd255a02d6c48b2dcd1d128978eed shouldn't have changed imports of "global $phpEx". PHPBB3-11041
* | | Merge remote-tracking branch 'EXreaction/ticket/10885' into developAndreas Fischer2012-08-061-9/+8
|\ \ \ | | | | | | | | | | | | | | | | * EXreaction/ticket/10885: [ticket/10885] Fix UCP Main Error if no forums exist
| * | | [ticket/10885] Fix UCP Main Error if no forums existNathan Guse2012-08-061-9/+8
| | |/ | |/| | | | | | | | | | | | | | | | This error is caused by an empty set passed to sql_in_set if the user cannot read any forums PHPBB3-10885
* | | Merge remote-tracking branch 'EXreaction/ticket/11029' into developAndreas Fischer2012-08-061-8/+3
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | * EXreaction/ticket/11029: [ticket/11029] Remove $reparse variable [ticket/11029] Return $parsed_array (may have loaded from the cache) [ticket/11029] Cache obtain_cfg_items should return empty array on failure
| * | [ticket/11029] Remove $reparse variableNathan Guse2012-08-061-7/+2
| | | | | | | | | | | | | | | | | | | | | Its only set to false, then true in one case, and only checked once. So remove it because it is unnecessary. PHPBB3-11029
| * | [ticket/11029] Return $parsed_array (may have loaded from the cache)Nathan Guse2012-08-061-1/+1
| | | | | | | | | | | | | | | | | | | | | Even if the file does not exist, it may be in the cache, so return $parsed_array just in case PHPBB3-11029