1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-29 10:39:19 +02:00

81 Commits

Author SHA1 Message Date
Nathan Guse
5166240d62 [ticket/11833] Prevent Twig errors from invalid template loops using BEGINELSE
PHPBB3-11833
2013-09-09 11:26:40 -05:00
Dhruv
19074a3420 [ticket/11825] Move schema_data.php into includes/ instead of phpbb/
PHPBB3-11825
2013-09-03 19:44:07 +05:30
David King
6e028a5ecc Merge remote-tracking branch 'EXreaction/ticket/11755' into develop 2013-09-02 16:12:30 -07:00
Nathan Guse
4fd99a7b2e Merge pull request #1102 from imkingdavid/ticket/11215
[ticket/11215] Correct paths when path info is used for controller access
2013-09-02 15:55:22 -07:00
Nathan Guse
536eeb7afa [ticket/11755] MySQL upgrader out of date
De-duplicating code from create_schema_files, mysql_upgrader.

New file phpbb/db/schema_data which contains all the current schema data.

New function in db_tools public static function get_dbms_type_map() to make the
type map available everywhere (without requiring $db be setup already)

PHPBB3-11755
2013-09-02 16:58:34 -05:00
Nathan Guse
c8d5ec8927 [ticket/11812] Fix empty define
PHPBB3-11812
2013-09-02 16:35:42 -05:00
David King
a1b4c6f82a [ticket/11215] Fix helper_url_test.php tests
PHPBB3-11215
2013-09-02 12:53:37 -07:00
David King
913e5a1f2e [ticket/11215] Make controller helper url() method use correct format
PHPBB3-11215
2013-09-02 10:54:55 -07:00
Joas Schilling
9d6370751f Merge remote-tracking branch 'EXreaction/ticket/11724' into develop
* EXreaction/ticket/11724:
  [ticket/11724] Handle ELSE IF separately
  [ticket/11724] Replace spaces with tabs
  [ticket/11724] Support "ELSE IF" and "ELSEIF" in the same way
2013-08-30 19:53:54 +02:00
Nathan Guse
aae7677d71 [ticket/11628] Create base template class with common functions
E.g. assign_vars

PHPBB3-11628
2013-08-28 15:23:38 -05:00
Nathan Guse
68ed2b6035 Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11628
# By Bruno Ais (42) and others
# Via Joas Schilling (39) and others
* 'develop' of github.com:phpbb/phpbb3: (157 commits)
  [ticket/11803] Revert POLL_MAX_OPTIONS min value to 0
  [ticket/11799] Send anti abuse headers in "new password" emails.
  [ticket/11792] Add functional test for var lang_set_ext of core.user_setup
  [ticket/11804] Remove </li> from overall_header which was not open
  [ticket/11802] replace $browser with $user->browser
  [ticket/11801] removed some whitespace and added missing semi colon's in css
  [ticket/11792] Add performance remark to core.user_setup event PHPDoc
  [ticket/11792] Add variable 'lang_set_ext' to event core.user_setup
  [ticket/11789] Remove inline color in memberlist_view
  [ticket/11800] Fix scripts variable in subsilver simple_footer
  [ticket/11800] Fix JavaScript in simple_footer.html
  [ticket/11800] Remove forum_fn from memberlist_search.html
  [ticket/11796] Replace pagination with pagination.html
  [ticket/11794] Add missing array element commas to docs/coding-guidelines.html
  [ticket/11775] Fix doc blocks syntax
  [ticket/11775] Remove spaces at line ends
  [ticket/11789] Remove colors from HTML code
  [ticket/11784] Remove naming redundancy for event listeners
  [ticket/11775] Split test into multiple steps
  [ticket/11777] Fix new test for loop variables in extension template listeners
  ...

Conflicts:
	phpBB/install/index.php
	phpBB/install/install_update.php
2013-08-28 13:30:48 -05:00
Nathan Guse
38a7aac0cc [ticket/11724] Handle ELSE IF separately
PHPBB3-11724
2013-08-28 12:29:01 -05:00
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
0215e0bd95 [ticket/11724] Replace spaces with tabs
PHPBB3-11724
2013-07-28 21:31:12 -05:00
Nathan Guse
d5c56c5d50 [ticket/11724] Support "ELSE IF" and "ELSEIF" in the same way
PHPBB3-11724
2013-07-27 20:02:03 -05:00
Nathan Guse
57bc3c7d3a [ticket/11628] phpbb_template, not phpbb_template_interface
PHPBB3-11628
2013-07-25 09:32:28 -05:00
Nathaniel Guse
ffbc144a73 [ticket/11628] Make get_template_vars protected
Remove all references to it and the hacky code in messenger that was using it

PHPBB3-11628
2013-07-24 13:38:12 -05:00
Nathaniel Guse
427fa17f7f [ticket/11628] Fix a bug I noticed in template->destroy
Should not be setting $this->context = array()!

PHPBB3-11628
2013-07-24 13:34:41 -05:00
Nathaniel Guse
8795a354fe [ticket/11628] Remove the one usage of get_style_path()
Makes the code easier to follow

PHPBB3-11628
2013-07-24 13:31:09 -05:00
Nathaniel Guse
3b46f77e4e [ticket/11628] Shorten an if to an inline statement
PHPBB3-11628
2013-07-24 13:26:55 -05:00
Nathaniel Guse
12c2258506 [ticket/11628] Remove template_path option on set_custom_style
This was set to default 'template/' to append template/ to all the paths,
but every location was actually just setting it to '' to not append anything.
So removed the option entirely (additional paths can be appended to the paths
being sent to the function already)

PHPBB3-11628
2013-07-24 13:25:20 -05:00
Nathaniel Guse
863592a8be [ticket/11628] Remove set_style_names function, moved to set_custom_style
PHPBB3-11628
2013-07-24 13:19:20 -05:00
Nathaniel Guse
4414278209 [ticket/11628] Set admin namespace in the constructor
PHPBB3-11628
2013-07-24 13:05:27 -05:00
Nathaniel Guse
67627f3336 [ticket/11628] Change set_custom_style $template path to default to string
Rather than default to false and compare === false ? 'template/' : value just
assign this default in the arguments

PHPBB3-11628
2013-07-24 13:01:30 -05:00
Nathaniel Guse
4b761f6575 [ticket/11628] Remove third parameter ($names) from set_custom_style
This was basically duplicating functionality. $names would be used if not
empty, else array($name) would be used. Merged functionality into the first
argument

PHPBB3-11628
2013-07-24 12:56:39 -05:00
Nathaniel Guse
bfbc7aa742 [ticket/11628] Return $this from set_style, set_custom_style
PHPBB3-11628
2013-07-24 12:45:35 -05:00
Nathaniel Guse
ecaed319ab [ticket/11628] Move setting core namespace to set_style()
PHPBB3-11628
2013-07-24 12:42:37 -05:00
Nathaniel Guse
85ff05bec6 [ticket/11628] Remove $this->names, $this->style_names from phpbb_template
These are not used anywhere

PHPBB3-11628
2013-07-24 12:34:22 -05:00
Nathaniel Guse
5d1afb4532 [ticket/11628] Remove phpbb_style (move methods to phpbb_template)
PHPBB3-11628
2013-07-24 12:24:35 -05:00
Nathaniel Guse
44a82dd083 [ticket/11628] Remove style path provider
No longer used since Twig was implemented.

PHPBB3-11628
2013-07-24 12:05:04 -05:00