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
Joas Schilling
c277c240f8
[feature/php-events] Fix doc and naming of core.viewtopic_modify_page_title
...
PHPBB3-9550
2012-08-06 17:05:22 +02:00
Joas Schilling
dcb4d3b926
[feature/php-events] Fix doc and naming of core.viewtopic_modify_post_row
...
PHPBB3-9550
2012-08-06 16:45:00 +02:00
Joas Schilling
eb80d280b1
[feature/php-events] Fix doc and naming of core.viewtopic_cache_user_data
...
PHPBB3-9550
2012-08-06 16:44:52 +02:00
Joas Schilling
ff12de97b7
[feature/php-events] Fix doc and naming of core.viewtopic_cache_guest_data
...
PHPBB3-9550
2012-08-06 16:44:40 +02:00
Joas Schilling
3f710b58a5
[feature/php-events] Fix doc and naming of core.viewtopic_get_post_data
...
PHPBB3-9550
2012-08-06 15:37:02 +02: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
Joas Schilling
93912a2649
[feature/php-events] Remove double space in comments
...
PHPBB3-9550
2012-08-05 23:11:36 +02:00
Joas Schilling
c28bd7cc60
[feature/php-events] Fix docs and naming of core.validate_config_variable
...
PHPBB3-9550
2012-08-05 23:09:44 +02:00
Joas Schilling
48a8482d23
[feature/php-events] Fix docs and naming of core.build_config_template
...
PHPBB3-9550
2012-08-05 22:51:22 +02:00
Joas Schilling
a326dc10cf
[feature/php-events] Add docs for core.adm_page_footer
...
PHPBB3-9550
2012-08-05 21:26:13 +02:00
Joas Schilling
296ab5c168
[feature/php-events] Add docs for core.adm_page_header
...
PHPBB3-9550
2012-08-05 21:20:14 +02:00
Joas Schilling
e926ec9934
[feature/php-events] Add docs for core.garbage_collection
...
PHPBB3-9550
2012-08-05 16:51:51 +02:00
Joas Schilling
997075a008
[feature/php-events] Add docs for core.page_footer
...
PHPBB3-9550
2012-08-05 16:46:57 +02:00
Joas Schilling
1f9b23e721
[feature/php-events] Add docs for core.page_header
...
PHPBB3-9550
2012-08-05 16:42:46 +02:00
Joas Schilling
171c07a084
[feature/php-events] Add core.acp_users_overview_run_quicktool
...
This event was split from core.acp_users_display_overview to make it work
as expected.
PHPBB3-9550
2012-08-05 15:39:42 +02:00
Joas Schilling
be61bcb7b5
[feature/php-events] Add core.acp_users_overview_modify_data
...
This event was split from core.acp_users_display_overview to make it work
as expected.
PHPBB3-9550
2012-08-05 15:27:08 +02:00
Joas Schilling
5db76ee8b0
[feature/php-events] Move and fix event core.acp_users_display_overview
...
The event had some invalid variables, so the event was moved to give it some
more power.
PHPBB3-9550
2012-08-05 15:03:08 +02:00
Joas Schilling
6571ea1fc8
[feature/php-events] Remove event core.acp_profile_field_edit
...
The currently implemented event is useless and we couldn't find a MOD, which
requires editing this file in that position.
PHPBB3-9550
2012-08-05 14:50:33 +02: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
Joas Schilling
4eefba9b3f
[feature/php-events] Fix naming and doc of core.ucp_add_zebra
...
PHPBB3-9550
2012-08-04 17:50:16 +02:00
Joas Schilling
a53ddec5a3
[feature/php-events] Fix naming and doc of core.ucp_remove_zebra
...
PHPBB3-9550
2012-08-04 17:47:03 +02:00
Joas Schilling
63a00efdd4
[feature/php-events] Fix naming and doc of core.ucp_pm_view_messsage
...
PHPBB3-9550
2012-08-04 17:37:54 +02:00
Joas Schilling
a9d4ed0cfc
[feature/php-events] Fix naming and doc of core.mcp_view_forum_modify_topicrow
...
PHPBB3-9550
2012-08-04 17:35:51 +02:00
Joas Schilling
0d182d9e93
[feature/php-events] Fix naming and doc of core.generate_smilies_after
...
PHPBB3-9550
2012-08-04 17:07:35 +02:00
Joas Schilling
b153637cb8
[feature/php-events] Fix naming and doc of core.ucp_display_module_before
...
PHPBB3-9550
2012-08-03 23:41:00 +02:00
Joas Schilling
63d17e5181
[feature/php-events] Fix naming and doc of core.viewforum_modify_topicrow
...
PHPBB3-9550
2012-08-03 23:32:48 +02: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