1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-12 12:46:38 +02:00
Commit Graph

112 Commits

Author SHA1 Message Date
8e5b5a5c07 Merge branch '3.1.x' 2016-01-16 23:10:37 +01:00
fef03a1946 [ticket/14412] Comment fixes for PHPDoc in the events
PHPBB3-14412
2016-01-15 14:07:50 +03:00
7f7b09fdeb Merge branch '3.1.x'
Conflicts:
	build/build.xml
	phpBB/docs/CHANGELOG.html
	phpBB/includes/acp/acp_bbcodes.php
2016-01-09 18:45:32 +01:00
73e6e5b77f [ticket/13454] Remove unused variables
This is the first part of the changes. More to come.

PHPBB3-13454
2016-01-06 13:51:19 +01:00
18abef716e [ticket/security-188] Check form key in acp_bbcodes
SECURITY-188
2015-12-23 17:31:43 +01:00
6bcf12a558 Merge pull request #3618 from marc1706/ticket/13832
[ticket/13832] Use preg_replace_callback instead of /e modifier
2015-06-24 16:36:15 +02:00
a430fef05b [ticket/13832] Use preg_replace_callback in acp_bbcodes
PHPBB3-13832
2015-05-19 16:29:10 +02:00
71f5c9c327 [ticket/13832] Use preg_replace_callback instead of /e modifier
PHPBB3-13832
2015-05-18 17:19:29 +02:00
8b7a42f338 [ticket/13614] Removed code that relies on phpbb_pcre_utf8_support()
Removed all calls to phpbb_pcre_utf8_support() as well as unreachable code.

PHPBB3-13614
2015-05-11 20:43:47 +02:00
cfbf02bcba [ticket/11768] Re-added the code that got lost in rebase
PHPBB3-11768
2015-04-02 19:16:01 +02:00
s9e
147a713cc0 [ticket/11768] This commit integrates s9e\TextFormatter
This commit integrates s9e\TextFormatter as outlined in
http://area51.phpbb.com/phpBB/viewtopic.php?f=108&t=44467

PHPBB3-11768
2015-04-02 19:16:01 +02:00
abcb2680ee [ticket/13455] Remove unnecessary calls to utf8_normalize_nfc()
PHPBB3-13455
2015-02-03 20:50:40 +01:00
f6e06da4c6 [ticket/13455] Update calls to request_var()
PHPBB3-13455
2015-02-03 20:50:40 +01:00
7fc586080b [ticket/13468] Update calls to add_log()
PHPBB3-13468
2015-01-27 18:34:33 +01:00
rxu
8002af7526 [ticket/13492] Add the migration to update custom bbcodes with IDN regexps
Also fix the $utf8 checking regexp removing the curly braces.

PHPBB3-13492
2015-01-20 08:47:56 +07:00
rxu
17f4dce0fc [ticket/13492] Add IDN support for custom BBCode URL tokens
Custom BBCode URL tokens does not support IDN.
Custom BBCodes added earlier than IDN has been applied are unaffected.

PHPBB3-13492
2015-01-11 20:36:22 +07:00
a759704b39 [ticket/12594] Remove @package tags and update file headers
PHPBB3-12594
2014-05-27 20:51:13 +02:00
7c2239e75c Merge remote-tracking branch 'github-nickvergessen/ticket/12273' into develop-ascraeus
* github-nickvergessen/ticket/12273: (55 commits)
  [ticket/12273] Move $extension to constructor so the path is always set
  [ticket/12273] Find events.md relative from the path not the phpbb root
  [ticket/12273] Do not look in extensions docs/ and tests/ directory
  [ticket/12273] Also check file for adm "Location:" events
  [ticket/12273] Do not allow template events in non-html files
  [ticket/12273] Fix return description
  [ticket/12273] Update exporter to allow specifying an extension
  [ticket/12273] Allow to filter events for extensions
  [ticket/12273] Remove old parameter from function call
  [ticket/12273] Fix table header for adm events
  [ticket/12273] Add root path to recursive_event_filter_iterator
  [ticket/12273] Fix missing classes in export_events_for_wiki.php
  [ticket/12273] Use RecursiveDirectoryIterator with filter in php_exporter
  [ticket/12273] Use RecursiveDirectoryIterator in md_exporter
  [ticket/12273] Fix doc blocks
  [ticket/12273] Do not allow 3.1-A1 for template events
  [ticket/12273] Sort arguments alphabetically before exporting
  [ticket/12273] Do not allow 3.1-A1 version
  [ticket/12273] Update since version to 3.1.0-a* style
  [ticket/12273] Update existing events
  ...
2014-05-02 12:22:05 +02:00
89391dec08 [ticket/12458] Apply Squiz.WhiteSpace.SuperfluousWhitespace.* to legacy code.
* There MUST NOT be trailing whitespace at the end of lines.
* There MUST NOT be whitespace before the first content of a file.
* There MUST NOT be whitespace after the last content of a file.
* Functions MUST NOT contain multiple empty lines in a row.

PHPBB3-12458
2014-04-29 17:51:21 +02:00
87899b0e14 [ticket/12273] Update existing events
PHPBB3-12273
2014-04-25 11:46:44 +02:00
c2dace762e [ticket/12273] Fix long $vars lines for existing events
PHPBB3-12273
2014-04-24 17:26:27 +02:00
4665e3df21 [ticket/12060] Further clarifying new event docblocks as much as possible
PHPBB3-12060
2013-12-16 23:54:55 -08:00
01c4235f00 [ticket/12060] More fixes to dockblock for acp_bbcodes_modify_create event
PHPBB3-12060
2013-12-16 15:33:44 -08:00
6b178c758e [ticket/12060] Fix docblock for acp_bbcodes_modify_create event
PHPBB3-12060
2013-12-16 15:31:25 -08:00
aa0c463d0f [ticket/12060] Further clarify/fix a var in acp_bbcodes_modify_create event doc block
PHPBB3-12060
2013-12-13 16:46:12 -08:00
b26e4dd42c [ticket/12060] Correctly label alpha versions in event docblocks
PHPBB3-12060
2013-12-13 10:31:04 -08:00
21e269b9ca [ticket/12060] Fix u_action comments in docblocks
PHPBB3-12060
2013-12-12 14:09:58 -08:00
75831dc2d0 [ticket/12060] Change @since in event docblocks
PHPBB3-12060
2013-12-12 14:09:30 -08:00
730a05bd30 [ticket/12060] Update the docblock comments in acp core events
PHPBB3-12060
2013-12-12 13:59:30 -08:00
caca36bc50 [ticket/12060] Refactor u_action in the events that use it
PHPBB3-12060
2013-12-12 13:58:59 -08:00
6ccec39e43 [ticket/12060] Use $sql_ary instead of $sql
PHPBB3-12060
2013-12-12 13:50:13 -08:00
b1e05be6ea [ticket/12060] Adjust last item in array to use a comma instead of closing parenthesis
PHPBB3-12060
2013-12-12 09:55:21 -08:00
3659ba884e [ticket/12060] Copy this_u_action back to original this->u_action var
PHPBB3-12060
2013-12-12 09:54:46 -08:00
f41638ebbf [ticket/12060] Fix typo in core.acp_bbcodes_edit_add doc block
PHPBB3-12060
2013-12-05 13:52:20 -08:00
d93200c973 [ticket/12060] Add bbcode tokens array to core.acp_bbcodes_edit_add
PHPBB3-12060
2013-12-05 13:49:47 -08:00
8f309a70db [ticket/12060] Add $phpbb_dispatcher to acp_bbcodes.php for events
PHPBB3-12060
2013-12-04 16:43:26 -08:00
2e33095177 [ticket/12060] Add acp event core.acp_bbcodes_display_bbcodes
Modify display of bbcodes in the form

PHPBB3-12060
2013-12-04 16:42:55 -08:00
79b8ecad4d [ticket/12060] Add acp event core.acp_bbcodes_display_form
Modify bbcode template data before we display the form

PHPBB3-12060
2013-12-04 16:42:07 -08:00
226376c573 [ticket/12060] Add acp event core.acp_bbcodes_modify_create
Modify bbcode data before modify/create

PHPBB3-12060
2013-12-04 16:40:41 -08:00
a4d20d988b [ticket/12060] Add acp event core.acp_bbcodes_edit_add
Modify bbcode template before we display the add/edit form

PHPBB3-12060
2013-12-04 16:39:10 -08:00
6a87388e69 [ticket/11973] Remove logic from tokens language array
Previously if a translator did no translate a token, it would not be
displayed. On the other hand, the translator could add additional tokens
which have no functionality.  Functionality is already hardcoded into
bbcode.php so we can that in the ACP aswell, in order to prevent namend
issues.

PHPBB3-11973
2013-10-26 23:55:19 +02:00
b95fdacdd3 [ticket/11700] Move all recent code to namespaces
PHPBB3-11700
2013-09-16 00:25:27 +02:00
34ad665c8b Merge branch 'ticket/8319' into ticket/8319-develop2
* ticket/8319:
  [ticket/8319] Do not repeat the replacement
  [ticket/8319] Add explanation for RELATIVE_URL and update LOCAL_URL
  [ticket/8319] Update BBCodes that currently use the LOCAL_URL tag on update
  [ticket/8319] Add new token RELATIVE_URL to allow foreign relative URL parts
  [ticket/8319] Prepend Board URL to LOCAL_URL links to prevent abuse

Conflicts:
	phpBB/install/database_update.php
2013-07-10 17:24:49 +02:00
9210d735a5 [ticket/8319] Do not repeat the replacement
PHPBB3-8319
2013-07-10 17:13:02 +02:00
6206d4aa4e [ticket/8319] Add explanation for RELATIVE_URL and update LOCAL_URL
The explanation now states that links are prefixed with the board URL.

PHPBB3-8319
2013-06-03 12:37:58 +02:00
c0e0c13cf1 [ticket/8319] Add new token RELATIVE_URL to allow foreign relative URL parts
PHPBB3-8319
2013-06-03 12:37:54 +02:00
81140ec887 [ticket/8319] Prepend Board URL to LOCAL_URL links to prevent abuse
The description says:
"The URL must be relative to the topic page and cannot contain a server name
or protocol."
We now enforce this and will add a new token with the current behaviour back.

PHPBB3-8319
2013-06-03 12:37:54 +02:00
11112314f7 [ticket/10271] AJAXified various deletions in the ACP.
The following places have had deletion AJAXified:
* Smilies and icons
* Word censors
* BBCodes
* Attachment groups
* Groups
* Admin / User / Moderator / Forum roles
* Report / denial reasons
* Module management
* Custom profile fields

PHPBB3-10271
2012-03-31 02:09:15 +02:00
7a04c9048c [ticket/9916] Updating header license and removing Version $Id$
PHPBB3-9916
2011-12-31 13:32:52 +00:00
ac11806bf4 [ticket/10329] Add phpbb_ prefix to new pcre_utf8_support() function.
Introduced by 6b4d0a2542.

PHPBB3-10329
2011-08-21 14:34:34 +02:00