diff options
| author | Nils Adermann <naderman@naderman.de> | 2012-11-10 07:46:50 -0800 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2012-11-10 07:46:50 -0800 |
| commit | f0cfae1f014e5defd373bac74b5d915fc3568c7a (patch) | |
| tree | 04f0c8ef151c7e8e0d7adf2452624c24c4a71dd8 /phpBB/includes/template | |
| parent | 3f933c6870188d0e47e186fddfdc4f3b56a57009 (diff) | |
| parent | a05f354fdf903d00e85d8e4ad1d50f9ef906534d (diff) | |
| download | forums-f0cfae1f014e5defd373bac74b5d915fc3568c7a.tar forums-f0cfae1f014e5defd373bac74b5d915fc3568c7a.tar.gz forums-f0cfae1f014e5defd373bac74b5d915fc3568c7a.tar.bz2 forums-f0cfae1f014e5defd373bac74b5d915fc3568c7a.tar.xz forums-f0cfae1f014e5defd373bac74b5d915fc3568c7a.zip | |
Merge pull request #881 from Fyorl/ticket/10970
Allow INCLUDE template macros to accept paths of the form {FOO}/a/{BAR}/c
Diffstat (limited to 'phpBB/includes/template')
| -rw-r--r-- | phpBB/includes/template/filter.php | 61 | ||||
| -rw-r--r-- | phpBB/includes/template/template.php | 6 |
2 files changed, 51 insertions, 16 deletions
diff --git a/phpBB/includes/template/filter.php b/phpBB/includes/template/filter.php index abee32c8f7..66d28242a3 100644 --- a/phpBB/includes/template/filter.php +++ b/phpBB/includes/template/filter.php @@ -362,6 +362,43 @@ class phpbb_template_filter extends php_user_filter } /** + * Parse paths of the form {FOO}/a/{BAR}/b + * + * Note: this method assumes at least one variable in the path, this should + * be checked before this method is called. + * + * @param string $path The path to parse + * @param string $include_type The type of template function to call + * @return string An appropriately formatted string to include in the + * template or an empty string if an expression like S_FIRST_ROW was + * incorrectly used + */ + private function parse_dynamic_path($path, $include_type) + { + $matches = array(); + $replace = array(); + $is_expr = true; + + preg_match_all('#\{((?:' . self::REGEX_NS . '\.)*)(\$)?(' . self::REGEX_VAR . ')\}#', $path, $matches); + foreach ($matches[0] as $var_str) + { + $tmp_is_expr = false; + $var = $this->get_varref($var_str, $tmp_is_expr); + $is_expr = $is_expr && $tmp_is_expr; + $replace[] = "' . $var . '"; + } + + if (!$is_expr) + { + return " \$_template->$include_type('" . str_replace($matches[0], $replace, $path) . "', true);"; + } + else + { + return ''; + } + } + + /** * Compile variables * * @param string $text_blocks Variable reference in source template @@ -774,15 +811,9 @@ class phpbb_template_filter extends php_user_filter private function compile_tag_include($tag_args) { // Process dynamic includes - if ($tag_args[0] == '{') + if (strpos($tag_args, '{') !== false) { - $var = $this->get_varref($tag_args, $is_expr); - - // Make sure someone didn't try to include S_FIRST_ROW or similar - if (!$is_expr) - { - return "if (isset($var)) { \$_template->_tpl_include($var); }"; - } + return $this->parse_dynamic_path($tag_args, '_tpl_include'); } return "\$_template->_tpl_include('$tag_args');"; @@ -796,6 +827,11 @@ class phpbb_template_filter extends php_user_filter */ private function compile_tag_include_php($tag_args) { + if (strpos($tag_args, '{') !== false) + { + return $this->parse_dynamic_path($tag_args, '_php_include'); + } + return "\$_template->_php_include('$tag_args');"; } @@ -883,14 +919,9 @@ class phpbb_template_filter extends php_user_filter private function compile_tag_include_js($tag_args) { // Process dynamic includes - if ($tag_args[0] == '{') + if (strpos($tag_args, '{') !== false) { - $var = $this->get_varref($tag_args, $is_expr); - if (!$is_expr) - { - return " \$_template->_js_include($var, true);"; - } - return ''; + return $this->parse_dynamic_path($tag_args, '_js_include'); } // Locate file diff --git a/phpBB/includes/template/template.php b/phpBB/includes/template/template.php index 5d3ce4c82b..36d7bc5307 100644 --- a/phpBB/includes/template/template.php +++ b/phpBB/includes/template/template.php @@ -538,7 +538,11 @@ class phpbb_template // Locate file if ($locate) { - $file = $this->locator->get_first_file_location(array($file), true, true); + $located = $this->locator->get_first_file_location(array($file), false, true); + if ($located) + { + $file = $located; + } } else if ($relative) { |