1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-23 15:59:49 +02:00

51 Commits

Author SHA1 Message Date
Joas Schilling
b7b862d721 Merge remote-tracking branch 'rechosen/ticket/11792' into develop
* rechosen/ticket/11792:
  [ticket/11792] Add functional test for var lang_set_ext of core.user_setup
  [ticket/11792] Add performance remark to core.user_setup event PHPDoc
  [ticket/11792] Add variable 'lang_set_ext' to event core.user_setup
2013-08-22 12:57:49 +02:00
Dhruv
f7b967dc5a Merge remote-tracking branch 'Elsensee/ticket/11760' into develop
# By Oliver Schramm
# Via Oliver Schramm
* Elsensee/ticket/11760:
  [ticket/11760] Use phpbb_version_compare() wrapper
2013-08-19 23:28:53 +05:30
rechosen
953ca1785f [ticket/11792] Add performance remark to core.user_setup event PHPDoc
To prevent extension authors from loading all their translations globally, a
remark on this was added to the PHPDoc documentation of the core.user_setup
event.

PHPBB3-11792
2013-08-19 11:06:36 +02:00
rechosen
88e5ba4e57 [ticket/11792] Add variable 'lang_set_ext' to event core.user_setup
To allow extensions to add global language strings just like mods can, add the
'lang_set_ext' variable to the core.user_setup event. It requires an ext_name
to be specified as well as a lang_set, and loads the specified lang_set in the
context of the extension.

PHPBB3-11792
2013-08-19 11:06:36 +02:00
Matt Friedman
65d8cd6302 [ticket/11784] Remove naming redundancy for event listeners
PHPBB3-11784
2013-08-13 02:14:22 -07:00
Joas Schilling
585f692e31 Merge pull request #1643 from rechosen/ticket/11777
[ticket/11777] Search for template listeners in the php event listeners way
2013-08-12 06:37:47 -07:00
rechosen
08e6c61180 [ticket/11777] Require a suffix of '_listener' on extension template listeners
To further mirror the file name and location requirements for php template
event listeners, require extension template event listener files to follow the
'<event name>_listener.html' naming format.

PHPBB3-11777
2013-08-12 09:59:11 +02:00
rechosen
7f76c9f9c7 [ticket/11777] Rename the extension template listener subdirectory to 'event/'
Per suggestion of EXreaction and nickvergessen, do not look for extension
template event listeners in styles/[style]/template/events/ but in
styles/[style]/template/event/ (without the trailing 's') to match the way
phpBB looks for php template event listeners.

PHPBB3-11777
2013-08-12 09:59:11 +02:00
rechosen
49824a0fd3 [ticket/11777] Add subdirectory 'events/' to the template event search path
Makes the twig template engine look in the events/ subdirectory instead of the
main styles/[style]/template/ directory for extension template events. Note
that it does _not_ look recursively!

PHPBB3-11777
2013-08-12 09:59:10 +02:00
Vjacheslav Trushkin
a0206a61bc [ticket/11781] Include func update_post_information()
Include functions_posting before using functions defined in that file

PHPBB3-11781
2013-08-11 11:31:02 +03:00
Nathan Guse
c9cd7412f2 Merge pull request #1633 from nickvergessen/ticket/11751
[ticket/11751] Add mcp modules for softdelete  on update
2013-08-09 12:08:36 -07:00
Joas Schilling
e399dc162b Merge remote-tracking branch 'EXreaction/ticket/11701' into develop
* EXreaction/ticket/11701:
  [ticket/11701] New line at EOF
  [ticket/11701] Test events in loops
  [ticket/11701] Refix regex for appending |length
  [ticket/11701] Fix regex for appending |length
  [ticket/11701] Fix loops var check
  [ticket/11701] Remove useless str_replace
  [ticket/11701] Loop variables are not passed correctly to events
2013-08-09 17:25:00 +02:00
Dhruv
f35d732f40 Merge remote-tracking branch 'nickvergessen/ticket/11574' into develop
# By Joas Schilling (16) and Igor Wiedler (6)
# Via Joas Schilling (5) and Igor Wiedler (2)
* nickvergessen/ticket/11574: (22 commits)
  [ticket/11574] Remove install/udpate/new/ fallback from database_update.php
  [ticket/11574] Do not display incompatible package note after successful update
  [ticket/11574] Remove old "continue step"-message
  [ticket/11574] Change order of files and database update
  [ticket/11574] Fix more issues in the updater
  [ticket/11574] Add trailing slash for consistency
  [ticket/11574] Fix table prefix in database updater
  [ticket/11574] Fix various path issues in the updater
  [ticket/11574] Make install language filename less crazy
  [ticket/11574] Use alternate DI config file for updater
  [ticket/11574] Include normalizer so it loads form the correct directory
  [ticket/11574] Only fall back to install/update versions, when IN_INSTALL ;)
  [ticket/11574] Use log object instead of old function
  [ticket/11574] Include vendor into update packages
  [ticket/11574] Create phpbb_log object before using it.
  [ticket/11574] Add correct language parameter to return links
  [ticket/11574] Use request object rather then request_var function
  [ticket/11574] Load new language files whenever possible
  [ticket/11574] Require new files in install/index.php and add a class loader
  [ticket/11574] Require new files in database_update.php and add a class loader
  ...
2013-08-08 13:56:39 +05:30
Oliver Schramm
e667481c6c [ticket/11760] Use phpbb_version_compare() wrapper
PHPBB3-11760
2013-08-02 03:28:32 +02:00
Oliver Schramm
7d90f0a8a0 [ticket/11759] Change lowercase to uppercase
PHPBB3-11759
2013-08-02 02:49:28 +02:00
Joas Schilling
07bc935efe [ticket/11751] Add mcp modules for softdelete on update
PHPBB3-11751
2013-07-31 23:03:32 +02:00
Nathan Guse
d536a69e29 Merge pull request #1563 from cyberalien/ticket/11688
[ticket/11688] Purge TWIG cache
2013-07-31 08:10:46 -07:00
Oliver Schramm
8892205644 [ticket/11757] Fix typo in signature_module_auth migration
PHPBB3-11757
2013-07-30 22:41:12 +02:00
Vjacheslav Trushkin
5eb321d311 [ticket/11688] Fix docblock
PHPBB3-11688
2013-07-30 21:02:40 +03:00
Vjacheslav Trushkin
212294382d [ticket/11688] Rename purge_dir to remove_dir
PHPBB3-11688
2013-07-30 12:32:14 +03:00
Joas Schilling
91392c7288 Merge remote-tracking branch 'phpbb/develop' into ticket/11574
* phpbb/develop: (130 commits)
  [ticket/11638] Changed the layout to match the other similar commits
  [ticket/11640] removed the space that I wonder what it was doing there.
  [ticket/11749] Move event after all template data has been defined
  [ticket/10917] Variable used only once so delete it
  [ticket/10917] Revert use of phpbb wrapper
  [ticket/11749] Template events for topic_list_row_pre/append
  [ticket/11749] PHP Events for viewforum.php
  [ticket/11749] PHP Events for search.php
  [ticket/11740] Update FAQ to include Ideas Centre
  [ticket/11062] If user's language is english there is no further work needed
  [ticket/11062] Load new strings from user's language file if provided
  [ticket/10917] Using phpbb wrapper
  [ticket/10917] Fixed notice that files are out of date when updating to an unreleased version
  [ticket/11741] Fix empty brackets and remove bullet
  [ticket/11638] Removed the unneeded reset.
  [ticket/11638] Use the $parse_flags like the other commits
  [ticket/11638] Reverted to use the $parse tags way as the other ones
  [ticket/11638] Updated: bitwise $parse_flags use optionset()
  [ticket/11656] Made the check for the bitfield just like other PR's
  [ticket/11667] Use @inheritdoc
  ...
2013-07-30 01:06:11 +02:00
Nathan Guse
bf04bfcced [ticket/11667] Use @inheritdoc
PHPBB3-11667
2013-07-23 11:16:23 -05:00
Nathan Guse
485c6ab355 Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11667
# By Joas Schilling (224) and others
# Via Andreas Fischer (23) and others
* 'develop' of github.com:phpbb/phpbb3: (385 commits)
  [ticket/11734] Readd accidently removed language strings of forum permissions
  [ticket/11620] Whitespace and combine function into test_case
  [ticket/11620] Move check_ban_test functions to setUp/tearDown for clarity
  [ticket/11620] Changed incorrect global variable
  [ticket/11620] Minor indentation changes and comment clarity
  [ticket/11733] Fix "Illegal offset type" Warning caused by overall feed
  [ticket/11733] Add browse test for feed.php
  [ticket/11731] Remove static calls to captcha garbage collector
  [ticket/11728] Replace topic_approved with topic_visibility
  [ticket/11620] Expected and actual test conditions wrongly swapped
  [ticket/11620] Space between . in directory import concatenation
  [ticket/11620] Changes to match merge
  [ticket/11620] Changes for code guidelines consistency
  [ticket/11620] Fix a static calls to non-static for session captcha
  [ticket/11620] Cleanup creation_test that was renamed on a cherry-pick
  [ticket/11620] Update auth_provider for new interface
  [ticket/11620] Added garbage_collection_test
  [ticket/11620] Fixed check_ban_test errors with cache and ban warning message
  [ticket/11620] Fixed a typo on check_ban_test
  [ticket/11620]  Refactored check_isvalid_test to use session_test_case
  ...
2013-07-23 11:13:25 -05:00
Nathaniel Guse
ea250a5ef5 [ticket/11701] Refix regex for appending |length
PHPBB3-11701
2013-07-23 09:28:23 -05:00
Nathaniel Guse
2d764ef7d5 [ticket/11701] Fix regex for appending |length
PHPBB3-11701
2013-07-23 09:27:32 -05:00
Nathaniel Guse
c0b9db1c62 [ticket/11701] Fix loops var check
PHPBB3-11701
2013-07-23 09:26:50 -05:00
Nathaniel Guse
0d31420ae0 [ticket/11701] Remove useless str_replace
PHPBB3-11701
2013-07-23 09:25:58 -05:00
Nathaniel Guse
6b0b0f2a9f [ticket/11701] Loop variables are not passed correctly to events
PHPBB3-11701
2013-07-23 09:25:57 -05:00
Andreas Fischer
7d8e80241c Merge remote-tracking branch 'EXreaction/ticket/11718' into develop
* EXreaction/ticket/11718:
  [ticket/11718] Quick test for fixes in ELSEIF
  [ticket/11718] Twig lexer only correcting statements in IF, not ELSEIF

Conflicts:
	tests/template/template_test.php
2013-07-23 04:24:05 +02:00
Andreas Fischer
017d809e74 Merge remote-tracking branch 'nickvergessen/ticket/11733' into develop
* nickvergessen/ticket/11733:
  [ticket/11733] Fix "Illegal offset type" Warning caused by overall feed
  [ticket/11733] Add browse test for feed.php
2013-07-23 01:17:13 +02:00
Joas Schilling
10ba1e73da [ticket/11733] Fix "Illegal offset type" Warning caused by overall feed
PHPBB3-11733
2013-07-23 00:59:51 +02:00
Andreas Fischer
c2d919f12d Merge remote-tracking branch 'asperous/ticket/11731' into develop
* asperous/ticket/11731:
  [ticket/11731] Remove static calls to captcha garbage collector
2013-07-23 00:07:38 +02:00
Andy Chase
80f81dd0d2 [ticket/11731] Remove static calls to captcha garbage collector
PHPBB3-11731
2013-07-22 15:04:30 -07:00
Joas Schilling
aa77367267 [ticket/11728] Replace topic_approved with topic_visibility
PHPBB3-11728
2013-07-22 22:54:55 +02:00
Nathan Guse
127ee62edd Merge pull request #1589 from marc1706/ticket/11717
[ticket/11717] Use topic_posts_approved instead of topic_replies
2013-07-22 12:20:17 -07:00
Nathan Guse
b71038486e Merge pull request #1513 from nickvergessen/ticket/11582
Ticket/11582 Split permission logic from translations
2013-07-22 11:28:55 -07:00
Marc Alexander
603dc1f786 [ticket/11717] Use topic_posts_approved instead of topic_replies
Due to the move to soft-delete, the topic_replies column no longer exists
in the topics table. Instead, the column topic_posts_approved should be used.

PHPBB3-11717
2013-07-20 21:21:36 +02:00
Nathaniel Guse
375976eb38 [ticket/11707] Twig DEFINE not working as expected
PHPBB3-11707
2013-07-19 14:12:28 -05:00
Nathaniel Guse
b92f660ed3 [ticket/11718] Twig lexer only correcting statements in IF, not ELSEIF
PHPBB3-11718
2013-07-19 13:08:41 -05:00
Igor Wiedler
8928240dc3 [ticket/11574] Fix more issues in the updater
* Stupid mistake in phpbb_create_update_container
* Do not bootstrap extensions in installer/updater
* Fix template lookup in installer/updater
* Do not attempt to delete posts from bots

The latter is a really fun problem. Since deleting posts now depends
on a new db column that does not exist yet, we cannot call delete_post
from a migration, ever. By using retain, we can hack around the issue
for now.

PHPBB3-11574
2013-07-14 15:40:19 -04:00
Igor Wiedler
c2b31ca101 Merge remote-tracking branch 'upstream/develop' into ticket/11574
* upstream/develop:
  [ticket/11704] Use the correct directory for dependency checking.
  [ticket/11704] Correctly escape "
  [ticket/11697] author_search() used incorrect parameter
2013-07-14 15:27:25 -04:00
Marc Alexander
a0e5f83311 [ticket/11706] Use @ to suppress errors for getimagesize in remote avatar
PHPBB3-11706
2013-07-14 15:13:09 -04:00
Vjacheslav Trushkin
a68aed5119 [ticket/11688] tpl_ files are no longer used
Remove tpl_ and ctpl_ from cache->purge() because those prefixes
are no longer used.

PHPBB3-11688
2013-07-14 13:20:41 -04:00
Joas Schilling
e4a5ce307d [ticket/11582] Test the event and and fix it.
PHPBB3-11582
2013-07-14 12:55:03 -04:00
Vjacheslav Trushkin
81e0859041 [ticket/11688] Purge TWIG cache
Purge directories
Replace opendir() with DirectoryIterator

PHPBB3-11688
2013-07-14 12:11:57 -04:00
Joas Schilling
9c72bbe284 [ticket/11582] Move file to new directory
PHPBB3-11582
2013-07-14 12:04:04 -04:00
Andreas Fischer
58a9e975f8 Merge remote-tracking branch 'galaxyAbstractor/ticket/11697' into develop
* galaxyAbstractor/ticket/11697:
  [ticket/11697] author_search() used incorrect parameter
2013-07-14 17:41:31 +02:00
Igor Wiedler
f6865dc33a Merge remote-tracking branch 'upstream/develop' into ticket/11574
* upstream/develop: (575 commits)
  [ticket/11702] Fix forum_posts left over for link-click counts in viewforum.php
  [ticket/11696] Move file to new directory
  [ticket/11696] Rename constructor to __construct()
  [ticket/11696] Remove manual loading of db_tools in extension controller test
  [ticket/11696] Rename db_tools.php so it can be autoloaded
  [ticket/11698] Moving all autoloadable files to phpbb/
  [ticket/11694] Do not locate assets with root path
  [ticket/11692] Don't update search_type in dev migration if already appended
  [ticket/11675] Fix template loop
  [ticket/11690] Old module class names may get autoloaded by class_exists
  [ticket/9649] Display information on index for moderators on unapproved posts
  [ticket/10999] Fix assets_version in ACP
  [prep-release-3.0.12] More changelog items for the 3.0.12 release.
  [ticket/11687] Add assets_version to phpbb_config
  [ticket/11686] Not checking for phpBB Debug errors on functional tests
  [ticket/11670] Consistency with logo: Replace "phpBB(tm)" with "phpBB(R)".
  [ticket/11674] Do not include vendor folder if there are no dependencies.
  [ticket/11685] Remove logout confirmation page
  [ticket/11684] Remove useless confirmation page after login and admin login
  [ticket/9657] Define user before injecting
  ...

Conflicts:
	phpBB/includes/functions_container.php
	phpBB/install/database_update.php
	phpBB/install/index.php
2013-07-14 11:34:58 -04:00
Joas Schilling
f302cbe175 [ticket/11696] Move file to new directory
PHPBB3-11696
2013-07-14 10:16:15 -04:00
Joas Schilling
057d860d07 [ticket/11696] Rename db_tools.php so it can be autoloaded
PHPBB3-11696
2013-07-14 10:10:05 -04:00