1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-24 20:13:22 +01:00

13 Commits

Author SHA1 Message Date
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
98b385bc1c [ticket/11628] Remove style resource locator
No longer used since Twig was implemented.

PHPBB3-11628
2013-07-24 11:59:21 -05: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
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
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
Nils Adermann
7030578bbe [ticket/11698] Moving all autoloadable files to phpbb/
PHPBB3-11698
2013-07-14 01:32:34 -04:00