mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-24 03:54:10 +01:00
Code Issues Releases Wiki Activity
13,816 Commits 17 Branches 190 Tags
Commit Graph

13816 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David King
b729609fb2 [ticket/11054] Fixed $config var description 
PHPBB3-11054
 2012-08-15 09:15:18 -04:00
David King
0b70c3d0d6 [ticket/11054] The user class is phpbb_user 
PHPBB3-11054
 2012-08-14 10:02:16 -04:00
David King
fe579cac83 [ticket/11054] Fixed documentation syntax for @var in extension/controller.php 
PHPBB3-11054
 2012-08-14 09:57:17 -04:00
Andreas Fischer
64ff06cf87 Merge remote-tracking branch 'dhruvgoel92/ticket/11048' into develop 
* 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
 2012-08-14 14:38:19 +02:00
Dhruv
a9fd98c136 [ticket/11048] use protected instead of private in pgsql fulltext 
PHPBB3-11048
 2012-08-14 17:47:01 +05:30
Dhruv
469d808365 [ticket/11048] use protected instead of private in native search 
PHPBB3-11048
 2012-08-14 17:46:17 +05:30
Dhruv
8e8e94ec4c [ticket/11048] remove @access from all docblocks 
PHPBB3-11048
 2012-08-14 17:43:01 +05:30
Dhruv
5698d03ead [ticket/11048] use protected instead of private in mysql fulltext 
PHPBB3-11048
 2012-08-14 17:35:24 +05:30
Dhruv
d0cdf445fb [ticket/11048] use protected instead of private in sphinx 
PHPBB3-11048
 2012-08-14 17:33:44 +05:30
Nils Adermann
dca9057559 Merge pull request #932 from EXreaction/ticket/10875 
Ticket/10875
 2012-08-14 02:30:49 -07:00
Andreas Fischer
7efca53b47 Merge remote-tracking branch 'dhruvgoel92/ticket/11032' into develop 
* dhruvgoel92/ticket/11032:
  [ticket/11032] sphinx retries before triggering error
 2012-08-14 10:58:50 +02:00
Dhruv
17b8719144 [ticket/11032] sphinx retries before triggering error 
Sphinx connection retries should be done before error is triggered.

PHPBB3-11032
 2012-08-11 01:06:07 +05:30
Dhruv
a3a359d80a [ticket/11048] add access specifiers to phpbb native search properties 
PHPBB3-11048
 2012-08-10 16:35:06 +05:30
Dhruv
42d6e0715f [ticket/11048] add access specifiers to sphinx search 
PHPBB3-11048
 2012-08-10 14:06:25 +05:30
Dhruv
dd56c401af [ticket/11048] add access specifiers to phpbb native search 
PHPBB3-11048
 2012-08-10 12:23:25 +05:30
Oleg Pudeyev
9ad1e41b4b Merge PR #944 branch 'dhruvgoel92/ticket/11032' into develop 
* dhruvgoel92/ticket/11032:
  [ticket/11032] trigger error in case search fails
 2012-08-10 02:42:47 -04:00
Dhruv
de8b7c0b7d [ticket/11048] add access specifiers to mysql search 
PHPBB3-11048
 2012-08-10 11:35:50 +05:30
Dhruv
b2e166dbfa [ticket/11048] add access specifiers to pgsql search 
PHPBB3-11048
 2012-08-10 11:30:02 +05:30
Dhruv
698b7999c4 [ticket/11032] trigger error in case search fails 
Admins are shown actual error while users are shown a search failed error
in case sphinx search fails.

PHPBB3-11032
 2012-08-10 10:46:32 +05:30
Andreas Fischer
4b8eac02f0 Merge remote-tracking branch 'mvinny/ticket/11046' into develop 
* mvinny/ticket/11046:
  [ticket/11046] Add border-radius for UCP message colours block
 2012-08-08 09:30:57 +02:00
Andreas Fischer
81061e1754 Merge remote-tracking branch 'mvinny/ticket/11047' into develop 
* mvinny/ticket/11047:
  [ticket/11047] Close TOTAL_MESSAGES at ucp_pm_viewfolder.html
 2012-08-08 09:30:56 +02:00
Oleg Pudeyev
7c6e1ba109 Merge PR #916 branch 'dhruvgoel92/ticket/11011' into develop 
* 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
 2012-08-08 03:19:00 -04:00
Dhruv
a422ddfe31 [ticket/11011] rename property phpEx to php_ext 
PHPBB3-11011
 2012-08-08 11:16:46 +05:30
Dhruv
794d6ec443 [ticket/11011] pass $auth to search backend constructor 
$auth global var is passed to search backend constructor, as it is used
by sphinx backend.

PHPBB3-11011
 2012-08-08 11:07:47 +05:30
Oleg Pudeyev
ce32a31b60 Merge PR #933 branch 'dhruvgoel92/ticket/11032' into develop 
* dhruvgoel92/ticket/11032:
  [ticket/11032] use method GetLastError to get error
  [ticket/11032] add sphinx errors to error log
 2012-08-08 01:18:10 -04:00
Vinny
e716c8fe83 [ticket/11047] Close TOTAL_MESSAGES at ucp_pm_viewfolder.html 
This problem only occurs in prosilver
With the variable unclosed, the language key isnt displayed

PHPBB3-11047
 2012-08-07 21:20:18 -03:00
Vinny
321b1f1a39 [ticket/11046] Add border-radius for UCP message colours block 
PHPBB3-11046
 2012-08-07 20:59:34 -03:00
Andreas Fischer
bb40b558f1 Merge remote-tracking branch 'Noxwizard/ticket/11043' into develop 
* 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
 2012-08-07 22:27:30 +02:00
Nathan Guse
4b7cdd4264 [ticket/10875] Fix cache test 
Check for the correct filename based on the way the cache driver creates it

PHPBB3-10875
 2012-08-06 18:43:46 -05:00
Andreas Fischer
095d7d97a3 Merge remote-tracking branch 'Fyorl/ticket/11044' into develop 
* 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
 2012-08-06 23:32:28 +02:00
Nathan Guse
1db91af000 [ticket/10875] Break queries onto separate lines and use double quotes 
Coding guidelines

PHPBB3-10875
 2012-08-06 16:28:56 -05:00
Nathan Guse
44e48817c3 [ticket/10875] Close $db connection at end of test 
Fixes a pgSQL issue

PHPBB3-10875
 2012-08-06 16:26:55 -05:00
Nathan Guse
b64ac12bd5 [ticket/10875] Use fixtures for sql cache test 
PHPBB3-10875
 2012-08-06 16:26:55 -05:00
Nathan Guse
dcefa16318 [ticket/10875] Return $query_id from sql_save 
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
 2012-08-06 16:26:55 -05:00
Igor Wiedler
ae3f86dbb0 Merge remote-tracking branch 'bantu/ticket/11041' into develop 
* bantu/ticket/11041:
  [ticket/11041] Correctly import PHP file extension from global space.
 2012-08-06 23:21:06 +02:00
Andreas Fischer
8ce0a4eebd Merge remote-tracking branch 'EXreaction/ticket/10885' into develop 
* EXreaction/ticket/10885:
  [ticket/10885] Fix UCP Main Error if no forums exist
 2012-08-06 23:07:32 +02:00
Nathan Guse
a2dd99b75e [ticket/10885] Fix UCP Main Error if no forums exist 
This error is caused by an empty set passed to sql_in_set
if the user cannot read any forums

PHPBB3-10885
 2012-08-06 16:01:05 -05:00
Andreas Fischer
bdbc57e49a Merge remote-tracking branch 'EXreaction/ticket/11029' into develop 
* 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
 2012-08-06 22:47:23 +02:00
Nathan Guse
1b126908c6 [ticket/11029] Remove $reparse variable 
Its only set to false, then true in one case, and only checked once.
So remove it because it is unnecessary.

PHPBB3-11029
 2012-08-06 15:10:20 -05:00
Nathan Guse
907f1771f9 [ticket/11029] Return $parsed_array (may have loaded from the cache) 
Even if the file does not exist, it may be in the cache, so return
$parsed_array just in case

PHPBB3-11029
 2012-08-06 15:05:06 -05:00
Fyorl
ecb310c6f7 [ticket/11044] Added comment explaining filename splitting 
PHPBB3-11044
 2012-08-06 08:32:12 +08:00
Fyorl
011b494bc5 [ticket/11044] Preserve the file extension in unique filenames 
PHPBB3-11044
 2012-08-05 22:13:35 +01:00
Fyorl
3390712ed7 [ticket/11044] Minor adjustments as per PR comments 
Changed private to protected, renamed check_name to unique_filename.

PHPBB3-11044
 2012-08-05 11:29:02 +01:00
Fyorl
70d9c02aae [ticket/11044] Compress class now deals with file conflicts 
PHPBB3-11044
 2012-08-04 16:52:41 +01:00
Andreas Fischer
3c71f07a3e [ticket/11043] Change hook name back to display, since that's where we hook in. 
PHPBB3-11043
 2012-08-03 05:57:07 -05:00
Andreas Fischer
ae612de663 [ticket/11043] Allow call_hook() to be called from more than one location. 
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
 2012-08-03 05:56:49 -05:00
Patrick Webster
10f8c738b6 [ticket/11043] Update template hook name 
PHPBB3-11043
 2012-08-03 01:33:51 -05:00
Andreas Fischer
a35ad4e689 [ticket/11041] Correctly import PHP file extension from global space. 
85bcdbad468cd255a02d6c48b2dcd1d128978eed shouldn't have changed imports of
"global $phpEx".

PHPBB3-11041
 2012-08-02 12:38:49 +02:00
Andreas Fischer
fa06b779ad Merge remote-tracking branch 'nickvergessen/ticket/11004' into develop 
* nickvergessen/ticket/11004:
  [ticket/11004] Always update suggestion button in timezone_preselect_select
  [ticket/11003] Ability to show full list of timezones with JavaScript enabled
  [ticket/11004] Make suggestion button a real button and fix it's value
 2012-08-02 12:10:26 +02:00
Dhruv
9358bf3de5 [ticket/11032] use method GetLastError to get error 
Instead of using _error property, use method GetLastError to retrieve
the error as sphinx API documentation states.

PHPBB3-11032
 2012-08-01 22:23:51 +05:30