mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-25 20:44:01 +01:00
Code Issues Releases Wiki Activity
14,185 Commits 17 Branches 190 Tags
Commit Graph

13117 Commits

Author SHA1 Message Date
Joas Schilling
43d17b2337 [feature/php-events] Fix doc and naming of core.acp_manage_forums_move_children 
PHPBB3-9550
 2012-08-08 13:22:20 +02:00
Joas Schilling
70c90bea4f [feature/php-events] Fix doc and naming of acp_manage_forums_update_data_after 
PHPBB3-9550
 2012-08-08 13:22:20 +02:00
Joas Schilling
cfd5fcbe26 [feature/php-events] Add new event core.acp_manage_forums_update_data_before 
Allows you to remove data from forum_data_sql before we update/create the forum

PHPBB3-9550
 2012-08-08 13:01:39 +02:00
Joas Schilling
caf76b4ceb [feature/php-events] Fix naming and doc of core.acp_manage_forums_validate_data 
PHPBB3-9550
 2012-08-08 12:50:47 +02:00
Joas Schilling
3beda0cbab [feature/php-events] Fix naming and doc of core.acp_manage_forums_display_form 
PHPBB3-9550
 2012-08-08 12:44:28 +02:00
Joas Schilling
38ba09e707 [feature/php-events] Fix naming and doc of acp_manage_forums_initialise_data 
PHPBB3-9550
 2012-08-08 12:38:23 +02:00
Joas Schilling
e3a9bf0376 [feature/php-events] Fix doc and naming of core.acp_forums_request_forum_data 
PHPBB3-9550
 2012-08-08 12:35:26 +02:00
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
Fyorl
f0804f2db6 [feature/attach-dl] Manually clean the topic title/post subject 
PHPBB3-11042
 2012-08-07 19:24:13 +01:00
Fyorl
c4655b32f3 [feature/attach-dl] Fixed a bug with single attachments 
PHPBB3-11042
 2012-08-07 18:21:29 +01:00
Fyorl
10f0fc0713 [feature/attach-dl] Added identifiers to attachment archive name 
Attachment archives now include the post/topic id and the subject.
Attachments downloaded from a topic are prefixed with their post
id.

PHPBB3-11042
 2012-08-07 18:19:58 +01:00
Fyorl
773c513ac0 [feature/attach-dl] Moved include of compress class inside function 
PHPBB3-11042
 2012-08-07 16:59:57 +01:00
Fyorl
a0bc902612 [feature/attach-dl] Removed superfluous ternary statement 
PHPBB3-11042
 2012-08-07 16:56:13 +01:00
Fyorl
32f7338361 [feature/attach-dl] Merge changes from bantu/feature/attach-dl 
PHPBB3-11042
 2012-08-07 16:10:01 +01:00
Andreas Fischer
8d914e05ae [feature/attach-dl] Get rid of unnecessary if block. Refactor switch block. 
PHPBB3-11042
 2012-08-07 17:03:46 +02:00
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
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
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