Commit graph

17672 commits

Author SHA1 Message Date
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
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
Andreas Fischer
f0516b7d2a Merge remote-tracking branch 'EXreaction/ticket/11667' into develop
* EXreaction/ticket/11667:
  [ticket/11667] Use @inheritdoc
  [ticket/11734] Readd accidently removed language strings of forum permissions
  [ticket/11667] Make functions abstract in includeasset
  [ticket/11667] includeasset should be abstract
2013-07-24 02:45:35 +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
Nathan Guse
be59885d5f Merge pull request #1601 from nickvergessen/ticket/11734
[ticket/11734] Readd accidently removed language strings of forum permissions
2013-07-23 07:31:10 -07:00
Joas Schilling
1d2d3032d3 [ticket/11734] Readd accidently removed language strings of forum permissions
PHPBB3-11734
2013-07-23 16:26:01 +02: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
1004aaf787 Merge remote-tracking branch 'asperous/ticket/11620' into develop
* asperous/ticket/11620: (46 commits)
  [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/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
  [ticket/11615] Refactored isvalid test to be more imperative
  [ticket/11615]  Rename continue -> check_isvalid for clarity
  [ticket/11620] Added a test for checking if users are banned
  [ticket/11620] Remove typo in beginning of session_key_test
  [ticket/11620] Typo in file name session_key_tests -> test
  ...
2013-07-23 03:12:33 +02:00
Andy Chase
2fe2724e68 [ticket/11620] Whitespace and combine function into test_case
PHPBB3-11620
2013-07-22 17:39:45 -07:00
Andy Chase
0c54fb034b [ticket/11620] Move check_ban_test functions to setUp/tearDown for clarity
PHPBB3-11620
2013-07-22 17:39:14 -07:00
Andy Chase
568de3b8ce [ticket/11620] Changed incorrect global variable
PHPBB3-11620
2013-07-22 16:27:22 -07:00
Andy Chase
cc6147f876 [ticket/11620] Minor indentation changes and comment clarity
PHPBB3-11620
2013-07-22 16:27:18 -07:00
Andy Chase
be16459b89 Merge branch 'develop' into ticket/11620 2013-07-22 16:27:07 -07: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
Joas Schilling
8dc8ee205a [ticket/11733] Add browse test for feed.php
PHPBB3-11733
2013-07-23 00:58:03 +02:00
Andreas Fischer
7c8e71845f Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11726] Don't run lint tests on Travis on postgres
2013-07-23 00:33:07 +02:00
Andreas Fischer
c0795cc4da Merge remote-tracking branch 'EXreaction/ticket/11726' into develop-olympus
* EXreaction/ticket/11726:
  [ticket/11726] Don't run lint tests on Travis on postgres
2013-07-23 00:32:58 +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
Andreas Fischer
73ae52d057 Merge remote-tracking branch 'nickvergessen/ticket/11728' into develop
* nickvergessen/ticket/11728:
  [ticket/11728] Replace topic_approved with topic_visibility
2013-07-22 23:21:46 +02:00
Joas Schilling
aa77367267 [ticket/11728] Replace topic_approved with topic_visibility
PHPBB3-11728
2013-07-22 22:54:55 +02:00
Andy Chase
9d38ded228 [ticket/11620] Expected and actual test conditions wrongly swapped
PHPBB3-11620
2013-07-22 13:52:17 -07:00
Andy Chase
9dbd42e945 [ticket/11620] Space between . in directory import concatenation
PHPBB3-11620
2013-07-22 13:51:06 -07:00
Andy Chase
28e98466d9 [ticket/11620] Changes to match merge
PHPBB3-11620
2013-07-22 12:26:02 -07: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
Andy Chase
e2a769ac79 Merge branch 'develop' into ticket/11620 2013-07-22 11:29:36 -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
Andy Chase
cc1aef47fb [ticket/11620] Changes for code guidelines consistency
PHPBB3-11620
2013-07-22 11:13:31 -07:00
asperous
de2cb59533 [ticket/11620] Fix a static calls to non-static for session captcha
These changes fixes an error in certain version of php that throws
an error if you call a non-static method statically.

PHPBB3-11620
2013-07-22 11:07:48 -07:00
asperous
25b189d33b [ticket/11620] Cleanup creation_test that was renamed on a cherry-pick
PHPBB3-11620
2013-07-22 11:07:47 -07:00
asperous
30f198c61a [ticket/11620] Update auth_provider for new interface
PHPBB3-11620
2013-07-22 11:07:46 -07:00
asperous
7dbd85ad02 [ticket/11620] Added garbage_collection_test
PHPBB3-11620
2013-07-22 11:07:45 -07:00
asperous
af3a4ee33a [ticket/11620] Fixed check_ban_test errors with cache and ban warning message
PHPBB3-11620
2013-07-22 11:07:45 -07:00
asperous
13e4271c50 [ticket/11620] Fixed a typo on check_ban_test
PHPBB3-11620
2013-07-22 11:07:44 -07:00
asperous
2d850ba7a8 [ticket/11620] Refactored check_isvalid_test to use session_test_case
Since the continue->isvalid refactoring is now in a branch with the
session_test_case framework, this test can be refactored to use that framework.

PHPBB3-11620
2013-07-22 11:07:43 -07:00
Andy Chase
e74abfaa2c [ticket/11615] Refactored isvalid test to be more imperative
Refactoring the continue/is_valid test to remove
the confusing data provider work around, while
still keeping redundancies down to a minimum.

PHPBB3-11615
2013-07-22 11:07:43 -07:00