1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-14 05:36:30 +02:00
Commit Graph

172 Commits

Author SHA1 Message Date
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
863592a8be [ticket/11628] Remove set_style_names function, moved to set_custom_style
PHPBB3-11628
2013-07-24 13:19:20 -05:00
4414278209 [ticket/11628] Set admin namespace in the constructor
PHPBB3-11628
2013-07-24 13:05:27 -05:00
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
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
bfbc7aa742 [ticket/11628] Return $this from set_style, set_custom_style
PHPBB3-11628
2013-07-24 12:45:35 -05:00
ecaed319ab [ticket/11628] Move setting core namespace to set_style()
PHPBB3-11628
2013-07-24 12:42:37 -05:00
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
5d1afb4532 [ticket/11628] Remove phpbb_style (move methods to phpbb_template)
PHPBB3-11628
2013-07-24 12:24:35 -05:00
98b385bc1c [ticket/11628] Remove style resource locator
No longer used since Twig was implemented.

PHPBB3-11628
2013-07-24 11:59:21 -05:00
bf04bfcced [ticket/11667] Use @inheritdoc
PHPBB3-11667
2013-07-23 11:16:23 -05:00
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
ea250a5ef5 [ticket/11701] Refix regex for appending |length
PHPBB3-11701
2013-07-23 09:28:23 -05:00
2d764ef7d5 [ticket/11701] Fix regex for appending |length
PHPBB3-11701
2013-07-23 09:27:32 -05:00
c0b9db1c62 [ticket/11701] Fix loops var check
PHPBB3-11701
2013-07-23 09:26:50 -05:00
0d31420ae0 [ticket/11701] Remove useless str_replace
PHPBB3-11701
2013-07-23 09:25:58 -05:00
6b0b0f2a9f [ticket/11701] Loop variables are not passed correctly to events
PHPBB3-11701
2013-07-23 09:25:57 -05:00
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
375976eb38 [ticket/11707] Twig DEFINE not working as expected
PHPBB3-11707
2013-07-19 14:12:28 -05:00
b92f660ed3 [ticket/11718] Twig lexer only correcting statements in IF, not ELSEIF
PHPBB3-11718
2013-07-19 13:08:41 -05:00
62b33968c2 [ticket/11700] include and define are not valid class names
PHPBB3-11700
2013-07-14 15:38:04 -04:00
7030578bbe [ticket/11698] Moving all autoloadable files to phpbb/
PHPBB3-11698
2013-07-14 01:32:34 -04:00