makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-17 08:48:53 +00:00
Code Issues Projects Releases Packages Wiki Activity
19105 commits 18 branches 192 tags 207 MiB
Commit graph

19105 commits

This branch
This branch
All branches
Author SHA1 Message Date
Joseph Warner
f48effb001 [feature/auth-refactor] Fix the actual cause of test failures 
Enables super globals before the new container is instantiated in
the final step of installation to prevent issues caused by trying
to create a phpbb_request object when super globals are disabled.

PHPBB3-9734
 2013-07-01 22:40:49 -04:00
Nathaniel Guse
f249a527e5 [feature/twig] Should have been else 
PHPBB3-11598
 2013-07-01 21:32:10 -05:00
Nathaniel Guse
3b9cb7faa7 [feature/twig] Fix call for previous change to var name case 
PHPBB3-11598
 2013-07-01 21:29:15 -05:00
Nathaniel Guse
f902523956 [feature/twig] Comments 
PHPBB3-11598
 2013-07-01 21:24:27 -05:00
Nathaniel Guse
3dc40ad844 [feature/twig] Use correct case for variable name 
PHPBB3-11598
 2013-07-01 21:22:50 -05:00
Nathaniel Guse
e0f5e23032 [feature/twig] Fixed tabs in environment.php 
PHPBB3-11598
 2013-07-01 21:21:37 -05:00
Nathaniel Guse
16ebf14653 [feature/twig] Clean up the messenger a little bit 
This should fix at least one bug, noticed we were using:
$this->vars = &$this->tpl_obj->_rootref;

Which hasn't been valid for a long+ time

PHPBB3-11598
 2013-07-01 21:18:09 -05:00
Nathaniel Guse
8f303b376b [feature/twig] Don't forget to set the context when rendering! 
PHPBB3-11598
 2013-07-01 21:16:36 -05:00
Nathaniel Guse
1c7e077fea [feature/twig] Remove get_lang function (it's not used anywhere) 
PHPBB3-11598
 2013-07-01 21:11:24 -05:00
Nathaniel Guse
46d6899b46 [feature/twig] Do not assign var by reference 
PHPBB3-11598
 2013-07-01 20:41:36 -05:00
Nathaniel Guse
87e4e05220 Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/twig 
# By Dhruv
# Via Andreas Fischer (3) and Dhruv (1)
* 'develop' of https://github.com/phpbb/phpbb3:
  [ticket/10838] Fix URL for wiki and remove irrelevant line
  [ticket/10838] Remove php 5.4 and builtin server references
  [ticket/10838] Fix missing data
  [ticket/10838] separate database used mentioned in unit tests
  [ticket/11585] Make $auth_admin class property
  [ticket/10838] Updated RUNNING_TESTS.md
 2013-07-01 20:38:29 -05:00
Nathaniel Guse
943728d3ef [feature/twig] Fix length replace in lexer 
PHPBB3-11598
 2013-07-01 14:58:20 -05:00
Nathaniel Guse
1a58d188aa [feature/twig] Prevent errors from empty user->style 
PHPBB3-11598
 2013-07-01 14:42:05 -05:00
Andreas Fischer
fb777b3e20 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10838] Fix URL for wiki and remove irrelevant line
  [ticket/10838] Remove php 5.4 and builtin server references
  [ticket/10838] Fix missing data
  [ticket/10838] separate database used mentioned in unit tests
  [ticket/10838] Updated RUNNING_TESTS.md
 2013-07-01 21:23:07 +02:00
Andreas Fischer
1a292750f2 Merge remote-tracking branch 'dhruvgoel92/ticket/10838' into develop-olympus 
* dhruvgoel92/ticket/10838:
  [ticket/10838] Fix URL for wiki and remove irrelevant line
  [ticket/10838] Remove php 5.4 and builtin server references
  [ticket/10838] Fix missing data
  [ticket/10838] separate database used mentioned in unit tests
  [ticket/10838] Updated RUNNING_TESTS.md
 2013-07-01 21:22:51 +02:00
Dhruv
440986dc3f [ticket/10838] Fix URL for wiki and remove irrelevant line 
PHPBB3-10838
 2013-07-02 00:50:16 +05:30
Dhruv
89393e11e8 [ticket/10838] Remove php 5.4 and builtin server references 
PHPBB3-10838
 2013-07-02 00:50:15 +05:30
Dhruv
9c9f09d640 [ticket/10838] Fix missing data 
PHPBB3-10838
 2013-07-02 00:50:14 +05:30
Dhruv
5ed4dbb5b7 [ticket/10838] separate database used mentioned in unit tests 
Separate database used for tests which is deleted each time
tests are run information is added to unit tests.

PHPBB3-10838
 2013-07-02 00:47:32 +05:30
Andreas Fischer
60e474c551 Merge remote-tracking branch 'dhruvgoel92/ticket/11585' into develop 
* dhruvgoel92/ticket/11585:
  [ticket/11585] Make $auth_admin class property
 2013-07-01 20:43:34 +02:00
Dhruv
9e3d5420ad [ticket/11585] Make $auth_admin class property 
$auth_admin is class property and used via $this reference in all
methods

PHPBB3-11585
 2013-07-02 00:10:30 +05:30
Nathaniel Guse
d7cff78443 [feature/twig] Use adm_relative_path to build admin namespace 
PHPBB3-11598
 2013-07-01 13:39:51 -05:00
Nathaniel Guse
9fbba760fb [feature/twig] Remove classes related to old template engine 
PHPBB3-11598
 2013-07-01 13:34:28 -05:00
Nathaniel Guse
793ee3f8d9 [feature/twig] Remove debug code, set debug/auto reload correctly 
PHPBB3-11598
 2013-07-01 13:32:43 -05:00
Nathaniel Guse
bdc05b7dc8 [feature/twig] Remove resource locator dependency from template 
PHPBB3-11598
 2013-07-01 13:28:08 -05:00
Nathaniel Guse
2d9bbe0ef2 [feature/twig] Fix template/context.php 
PHPBB3-11598
 2013-07-01 13:26:00 -05:00
Nathaniel Guse
3060cbe089 [feature/twig] Fix template/template_php_test.php 
Must create a template file in the cache to load as this causes errors
otherwise. The problem was that Twig builds template files into classes,
which are always stored in PHP memory after being loaded. Because of this,
Twig would never recompile a template that was already compiled on the same
page load (so switching enable PHP on/off in two tests would not work).

PHPBB3-11598
 2013-07-01 13:17:59 -05:00
Nathaniel Guse
6f925552a5 [feature/twig] Fix includephp_from_subdir_test.php 
PHPBB3-11598
 2013-07-01 13:06:37 -05:00
Nathaniel Guse
341bae40eb [feature/twig] Remove the twig loader class that I started (don't use it) 
PHPBB3-11598
 2013-07-01 12:58:31 -05:00
Dhruv
c80b80ca0f Merge branch 'ticket/11566' into ticket/11566-develop 
* ticket/11566:
  [ticket/11566] Subsilver template error displayed after table headers
  [ticket/11566] Remove extra pair of brackets from conditional statement
  [ticket/11566] Check that guest doesn't have reporting permission by default
  [ticket/11566] Add captcha to report post template in subsilver
  [ticket/11566] Use the new constant CONFIRM_REPORT for captcha init
  [ticket/11566] Rename var to $visual_confirmation_response
  [ticket/11566] Revert forum permission changes
  [ticket/11566] Use language variable instead of hardcode
  [ticket/11566] add tests for reporting post
  [ticket/11566] add captcha reset and hidden fields
  [ticket/11566] display error instead of trigger_error
  [ticket/11566] add error in template
  [ticket/11566] add error functionality
  [ticket/11566] add interface for captcha

Conflicts:
	phpBB/report.php
 2013-07-01 23:25:29 +05:30
Joseph Warner
66118ea49e [feature/auth-refactor] A possible fix for the functional test failures 
I don't like this fix as it really shouldn't be needed. But it
makes the functional tests pass.

PHPBB3-9734
 2013-07-01 13:33:14 -04:00
Nathaniel Guse
6c30441ad4 [feature/twig] Changing INCLUDEJS behavior slightly 
Automatically parsing inline variables the same way it is done for
INCLUDE, INCLUDEPHP

PHPBB3-11598
 2013-07-01 12:26:01 -05:00
Nathaniel Guse
e9bbeeb1a4 [feature/twig] Fix includephp node 
PHPBB3-11598
 2013-07-01 12:23:25 -05:00
Nathaniel Guse
1b2e5503ac [feature/twig] PHP test moved to a separate file 
This had to be done because cached template files are available in memory,
so Twig doesn't ever reparse a template on the same page load

PHPBB3-11598
 2013-07-01 12:07:29 -05:00
Nathaniel Guse
f08330f762 Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/twig 
# By Dhruv (7) and others
# Via Andreas Fischer (7) and others
* 'develop' of https://github.com/phpbb/phpbb3:
  [ticket/11593] initialize $is_expr as null before being passed to get_varref
  [ticket/9341] Assert that page doesnt contain next or prev page posts
  [ticket/9341] Follow the Next/Prev link in tests follow the next/prev link and then assert if the page contains its last post or not
  [ticket/9341] remove PREV_PAGE tpl var used for backward compatability
  [ticket/11618] Replace glob() with scandir() and string matching
  [ticket/9341] Add tests for checking Next and Previous template vars
  [ticket/9341] Move create_topic and post into functional test case
  [ticket/11615] Fix typo in creation_test
  [ticket/11615] Remove magic number in creation_test
  [ticket/11615] Rename class in file to match
  [ticket/11615] Rename init_test to creation_test for clarity
  [ticket/9341] Use U_PREVIOUS and U_NEXT in template files
  [ticket/9341] Correctly named template vars

Conflicts:
	tests/template/template_test_case.php
 2013-07-01 12:03:24 -05:00
Nathaniel Guse
8c75d1c1bc [feature/twig] Fix template_test.php 
Various tests were broken completely, and some things such as whitespace
changed with Twig

PHPBB3-11598
 2013-07-01 11:58:16 -05:00
Nathaniel Guse
ddaccaf63e [feature/twig] A bit of cleanup in twig.php 
PHPBB3-11598
 2013-07-01 11:52:03 -05:00
Dhruv
045e04fb6f [ticket/11566] Subsilver template error displayed after table headers 
PHPBB3-11561
 2013-07-01 21:54:47 +05:30
Dhruv
d4645575fd [ticket/11566] Remove extra pair of brackets from conditional statement 
PHPBB3-11566
 2013-07-01 21:54:34 +05:30
Dhruv
84ec1f5423 [ticket/11566] Check that guest doesn't have reporting permission by default 
PHPBB3-11566
 2013-07-01 21:49:06 +05:30
Dhruv
ea8a4abe66 [ticket/11566] Add captcha to report post template in subsilver 
PHPBB3-11566
 2013-07-01 21:49:05 +05:30
Dhruv
4ad1d9aa65 [ticket/11566] Use the new constant CONFIRM_REPORT for captcha init 
PHPBB3-11566
 2013-07-01 21:49:04 +05:30
Dhruv
88b5180aa1 [ticket/11566] Rename var to $visual_confirmation_response 
PHPBB3-11566
 2013-07-01 21:49:02 +05:30
Dhruv
434d14e1d5 [ticket/11566] Revert forum permission changes 
Revert the f_report permission for guests in the functional tests

PHPBB3-11566
 2013-07-01 21:49:01 +05:30
Dhruv
1abc3d91d0 [ticket/11566] Use language variable instead of hardcode 
Add language variable in tests

PHPBB3-11566
 2013-07-01 21:49:00 +05:30
Dhruv
43053c541a [ticket/11566] add tests for reporting post 
Functional test for reporting post and check if captcha validation
is required for guests and not for registerted users

PHPBB3-11566
 2013-07-01 21:48:59 +05:30
Dhruv
c4fbed251d [ticket/11566] add captcha reset and hidden fields 
If captcha is solved and some other error pops up, store the
captcha in a hidden field.
Reset captcha if reporting the post is successful

PHPBB3-11566
 2013-07-01 21:48:57 +05:30
Dhruv
2c240f8a7b [ticket/11566] display error instead of trigger_error 
When the error report is empty display error
in the template instead of trigger_error

PHPBB3-11566
 2013-07-01 21:48:56 +05:30
Dhruv
7c9a1cbca9 [ticket/11566] add error in template 
Check if error exists, then display it
in the report post template.

PHPBB3-11566
 2013-07-01 21:48:54 +05:30
Dhruv
eafd0ae29f [ticket/11566] add error functionality 
add $error which stores the captcha error when captcha validation fails

PHPBB3-11566
 2013-07-01 21:48:53 +05:30