mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00
Code Issues Releases Wiki Activity

Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/twig

Browse Source 
# 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
This commit is contained in:
Nathaniel Guse
2013-07-01 12:03:24 -05:00
parent 8c75d1c1bc 8233c3e340
commit f08330f762
19 changed files with 174 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
phpBB/includes/template/filter.php
View File

@@ -475,6 +475,7 @@ class phpbb_template_filter extends php_user_filter
*/
private function compile_var_tags(&$text_blocks)
{
$is_expr = null;
$text_blocks = $this->get_varref($text_blocks, $is_expr);
$lang_replaced = $this->compile_language_tags($text_blocks);