Commit graph

14815 commits

Author SHA1 Message Date
Andreas Fischer
3de4a7e78d [feature/attach-dl] Also initialise $attachments as an array.
PHPBB3-11042
2012-08-07 16:55:31 +02:00
Andreas Fischer
4b06a220af [feature/attach-dl] Use extension_allowed() again.
PHPBB3-11042
2012-08-07 13:51:07 +02:00
Andreas Fischer
d6e8fbf94a [feature/attach-dl] Remove extra loop over attachments to get primary keys.
PHPBB3-11042
2012-08-07 13:43:31 +02:00
Andreas Fischer
8a8f48528a [feature/attach-dl] Correct comment for post_id and topic_id case.
PHPBB3-11042
2012-08-07 13:40:53 +02:00
Fyorl
3d68a6953e [feature/attach-dl] Moved download links to bottom of topic
PHPBB3-11042
2012-08-07 12:03:47 +01:00
Fyorl
058bf77a39 [feature/attach-dl] Moved functions_compress include
PHPBB3-11042
2012-08-07 12:00:10 +01:00
Andreas Fischer
89c102a744 [feature/attach-dl] phpbb_filter_disallowed_extensions: Preserve array keys.
PHPBB3-11042
2012-08-07 02:48:49 +02:00
Andreas Fischer
bba348d68a [feature/attach-dl] phpbb_check_attach_extensions: Get rid of pass-by-reference
PHPBB3-11042
2012-08-07 02:47:18 +02:00
Andreas Fischer
b6d4ee4244 [feature/attach-dl] Move !download_allowed() check up.
PHPBB3-11042
2012-08-07 02:37:08 +02:00
Andreas Fischer
ecab0212f8 [feature/attach-dl] Putting more old code under "else if ($download_id)".
PHPBB3-11042
2012-08-07 02:36:20 +02:00
Andreas Fischer
60d382df4c [feature/attach-dl] Putting some old code under "else if ($download_id)".
PHPBB3-11042
2012-08-07 02:10:15 +02:00
Andreas Fischer
87c822b794 [feature/attach-dl] Also merge topic_id query. a.topic_id can be used.
PHPBB3-11042
2012-08-07 01:59:02 +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
940b9e0658 [feature/attach-dl] Combine download_id and post_id queries.
PHPBB3-11042
2012-08-07 01:12:19 +02:00
Andreas Fischer
56cd7e5475 [feature/attach-dl] Store query result always in $attachments first.
PHPBB3-11042
2012-08-07 01:03:32 +02:00
Andreas Fischer
5986676f4d [feature/attach-dl] Exploit the "if ... else if ..." for the error message.
Use an "else" statement instead of checking everything at the top.

PHPBB3-11042
2012-08-07 00:33:23 +02:00
Andreas Fischer
862502aacd [feature/attach-dl] Use table aliases in all three cases.
PHPBB3-11042
2012-08-07 00:31:18 +02:00
Andreas Fischer
2d32164fb0 [feature/attach-dl] Remove unnecessary LIMIT from primary key query.
PHPBB3-11042
2012-08-07 00:10:24 +02:00
Andreas Fischer
3fe8344104 [feature/attach-dl] Use "else if" for precedence in case of multiple arguments.
PHPBB3-11042
2012-08-07 00:07:22 +02: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