makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-24 20:28:51 +00:00
Code Issues Projects Releases Packages Wiki Activity
16072 commits 18 branches 192 tags 207 MiB
Commit graph

16072 commits

This branch
This branch
All branches
Author SHA1 Message Date
Nils Adermann
18039cfa6a Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/11066] Remove debug code error_reporting(E_ALL) from mssqlnative.php
 2012-08-26 15:22:12 +02:00
Nils Adermann
4db4731fff Merge remote-tracking branch 'github-bantu/ticket/11066' into develop-olympus 
* github-bantu/ticket/11066:
  [ticket/11066] Remove debug code error_reporting(E_ALL) from mssqlnative.php
 2012-08-26 15:22:04 +02:00
Nils Adermann
90d26bb946 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/11060] Backport ca4cee86af to olympus.

Conflicts:
	.travis.yml
 2012-08-26 15:20:04 +02:00
Nils Adermann
a3d87a1443 Merge remote-tracking branch 'github-bantu/ticket/11060' into develop-olympus 
* github-bantu/ticket/11060:
  [ticket/11060] Backport ca4cee86af to olympus.
 2012-08-26 15:16:08 +02:00
Andreas Fischer
5407f9b00d [ticket/11060] Backport ca4cee86af to olympus. 
PHPBB3-11060
 2012-08-26 15:09:00 +02:00
David King
ca62b1ffb0 [feature/add_events] Added note in modify_posting_parameters 
The template assignment methods do not work until $user->setup() has been run.
This event is called before it, so extensions requiring template methods must
put such calls in a later event.

PHPBB3-9550
 2012-08-25 21:41:04 -04:00
Igor Wiedler
c6e522afb6 [feature/dic] Add a doc block for the prune_forum cron task forum_data 
PHPBB3-10739
 2012-08-25 17:16:20 +02:00
Igor Wiedler
919b13460d [feature/dic] Update composer.lock to symfony/* RC1 
PHPBB3-10739
 2012-08-25 17:08:38 +02:00
Igor Wiedler
a8425e1f50 [feature/dic] Fix re-ordering of services 
PHPBB3-10739
 2012-08-25 17:08:03 +02:00
Igor Wiedler
e103b2f0cc [feature/dic] Fix parse errors 
PHPBB3-10739
 2012-08-25 17:04:42 +02:00
Igor Wiedler
ae85d43757 Merge remote-tracking branch 'upstream/develop' into feature/dic 
* upstream/develop: (259 commits)
  [prep-release-3.0.11] Bumping version number for 3.0.11 final.
  [feature/php-events] Fix doc of core.viewonline_overwrite_location
  [feature/php-events] Fix doc of core.user_set_default_group
  [feature/php-events] Fix doc of core.generate_smilies_after
  [feature/php-events] Fix doc of core.delete_user_after
  [feature/php-events] Fix doc of core.delete_user_before
  [feature/php-events] Fix doc of core.update_username
  [feature/php-events] Fix doc of core.memberlist_prepare_profile_data
  [feature/php-events] Fix doc and position of viewonline_overwrite_location
  [feature/php-events] Fix doc of core.viewtopic_get_post_data
  [feature/php-events] Fix doc of core.viewtopic_cache_guest_data
  [ticket/11061] Add the --dev flag to the composer instructions in README
  [ticket/11060] Make sure pyrus can install everything on travis
  [ticket/11059] Use https for the README logo
  [feature/php-events] Fix acp_manage_forums_update_data_before and is_new_forum
  [feature/php-events] Fix core.acp_manage_forums_update_data_after vars
  [ticket/11032] fix language of error displayed
  [ticket/11052] update search backend constructor everywhere
  [ticket/11052] pass parametes to search construct while posting
  [ticket/11054] Fixed $config var description
  ...

Conflicts:
	phpBB/includes/cron/task/core/tidy_cache.php
	phpBB/includes/cron/task/core/tidy_search.php
 2012-08-25 17:00:40 +02:00
Igor Wiedler
fd9fd71a88 [feature/dic] Add docblock for cron_manager::wrap_task() 
PHPBB3-10739
 2012-08-25 16:54:30 +02:00
Igor Wiedler
4f0f63ae8f [feature/dic] Make cron task attributes protected, one per line 
PHPBB3-10739
 2012-08-25 16:51:19 +02:00
Igor Wiedler
4feb9aa8d7 [feature/dic] Coding style: Braces 
PHPBB3-10739
 2012-08-25 16:43:41 +02:00
Igor Wiedler
7e44ca4d49 [feature/dic] Re-order services alphabetically 
PHPBB3-10739
 2012-08-25 16:39:38 +02:00
David King
7ee3eb16ac [feature/add_events] Add more parameters to core.modify_posting_parameters 
PHPBB3-9550
 2012-08-23 12:49:09 -04:00
Jordan Rogers
73cd044f5c [ticket/11066] Remove debug code error_reporting(E_ALL) from mssqlnative.php 
For some reason, all errors are just flipped on before connecting to the
database, despite the system as a whole having a different setting for
displayable errors. Had to add & ~E_STRICT in PHP 5.4.5 to suppress Strict
Standards messages, but I would assume that the db piece shouldn't be involved
with setting error_reporting at all.

PHPBB3-11066
 2012-08-23 15:41:57 +02:00
David King
e67b010846 [feature/add_events] Put globals on one line 
PHPBB3-9550
 2012-08-22 10:41:59 -04:00
David King
575980cba9 [feature/add_events] Remove $allow_bbcode and $allow_smilies 
Upon testing it was discovered that these did not work as originally intended.

PHPBB3-9550
 2012-08-22 09:37:47 -04:00
David King
46597be1a3 [feature/add_events] Globalize event dispatcher object in some functions 
PHPBB3-9550
 2012-08-22 08:37:33 -04:00
David King
4f6f0c0897 [feature/add_events] Event to modify the data array for when a user is added 
PHPBB3-9550
 2012-08-21 17:04:16 -04:00
David King
0358db2184 [feature/add_events] Before and after events for generate_text_for_* functions 
PHPBB3-9550
 2012-08-21 16:42:30 -04:00
David King
1e29f064e8 [feature/add_events] Added events for modifying generate_text_for_display() 
The events allow you to perform extra functions on the text before nad/or
after it has been parsed for BBCode and Smilies.

PHPBB3-9550
 2012-08-21 12:55:16 -04:00
David King
92761e1f2b [ticket/10873] Change language for notice about undelivered, deleted PM. 
See the ticket for my reasoning.

PHPBB3-10873
 2012-08-21 11:59:44 -04:00
David King
a02bfcc83a [feature/add_events] core.posting_refresh -> core.modify_posting_paramters 
The event now lets extensions modify the posting paramters, not just refresh

PHPBB3-9550
 2012-08-21 11:50:38 -04:00
David King
05755e1b37 [feature/add_events] Fixed docs, added _profile_cache to event parameters 
PHPBB3-9550
 2012-08-21 11:31:18 -04:00
David King
c0cd1fcb4f [feature/add_events] Change alter -> modify in event name 
PHPBB3-9550
 2012-08-21 11:27:28 -04:00
David King
6c6b179dd4 [feature/add_events] Rename override to overwrite, made docs 79 chars/line 
PHPBB3-9550
 2012-08-21 11:25:52 -04:00
David King
008cf967ab [feature/add_events] Re-fix broken test 
PHPBB3-9550
 2012-08-21 11:18:53 -04:00
Joas Schilling
d289bc13ac [ticket/10714] Remove dependency injection and use global instead 
This avoids loading functions_admin.php globally and was suggested by naderman

PHPBB3-10714
 2012-08-21 16:49:08 +02:00
Joas Schilling
d828ef93f2 [ticket/10714] Fix unit test because of events and moved files 
PHPBB3-10714
 2012-08-21 16:36:32 +02:00
Joas Schilling
2afbec5ac4 [ticket/10714] Always try to trigger events on phpbb_dispatcher 
We may add the if () later again, if we decide to do that.

PHPBB3-10714
 2012-08-21 15:50:46 +02:00
Joas Schilling
151346c6e0 [ticket/10714] Remove event core.function_add_log, add_log should be used instead 
PHPBB3-10714
 2012-08-21 13:25:26 +02:00
Joas Schilling
7010524815 [ticket/10714] Enable event core.get_logs_get_additional_data 
PHPBB3-10714
 2012-08-21 13:19:13 +02:00
Joas Schilling
cf095dd393 [ticket/10714] Enable event core.get_logs_modify_entry_data 
PHPBB3-10714
 2012-08-21 13:12:50 +02:00
Joas Schilling
0bb4af90a4 [ticket/10714] Fix core.add_log event 
PHPBB3-10714
 2012-08-21 13:07:11 +02:00
Joas Schilling
bd6dfee23e [ticket/10714] Add event core.get_logs_modify_type 
core.get_logs_switch_mode is superseded by this one and therefor removed

PHPBB3-10714
 2012-08-21 13:06:43 +02:00
Joas Schilling
0fcbb40a0e [ticket/10714] Enable core.add_log event and remove superseded add_log_case 
PHPBB3-10714
 2012-08-21 12:40:55 +02:00
Joas Schilling
3170845a50 [ticket/10714] Refactor disable mechanism to only disable certain types 
Only disable admin log when adding multiple users, so critical errors are still
logged.

PHPBB3-10714
 2012-08-21 12:12:41 +02:00
Joas Schilling
2c7f498c1b [ticket/10714] Change $phpbb_dispatcher calls to the new layout 
PHPBB3-10714
 2012-08-21 12:12:40 +02:00
Joas Schilling
1e00c697b7 [ticket/10714] Add docblock for the test cases 
PHPBB3-10714
 2012-08-21 12:12:39 +02:00
Joas Schilling
325827c40f [ticket/10714] Inject the global $phpbb_log into view_log() 
PHPBB3-10714
 2012-08-21 12:12:38 +02:00
Joas Schilling
97290647fa [ticket/10714] Use phpbb_log class in view_log() 
PHPBB3-10714
 2012-08-21 12:12:37 +02:00
Joas Schilling
55b94af82e [ticket/10714] Implement get_logs() based on view_log() 
I moved some stuff into its own function to make the code a bit clearer.

PHPBB3-10714
 2012-08-21 11:59:37 +02:00
Joas Schilling
9248b9b25f [ticket/10714] Add doc block for view_log function 
PHPBB3-10714
 2012-08-21 11:59:36 +02:00
Joas Schilling
f5063a6eda [ticket/10714] Add incorrect offset calculation in view_log function 
PHPBB3-10714
 2012-08-21 11:59:35 +02:00
Joas Schilling
91384d8395 [ticket/10714] Add casts to integer values. 
PHPBB3-10714
 2012-08-21 11:59:35 +02:00
Joas Schilling
920cb1a0de [ticket/10714] Add unit tests for view_log function 
PHPBB3-10714
 2012-08-21 11:59:34 +02:00
Joas Schilling
ea652f0ec9 [ticket/10714] Rename add_log_function test 
PHPBB3-10714
 2012-08-21 11:59:33 +02:00
Joas Schilling
a0b35f8e4e [ticket/10714] Use {@inheritDoc} instead of repeating the doc-block 
PHPBB3-10714
 2012-08-21 11:59:32 +02:00