mirror of
https://github.com/phpbb/phpbb.git
synced 2025-07-12 04:36:32 +02:00
Merge branch '3.2.x'
This commit is contained in:
@ -50,7 +50,12 @@ abstract class includeasset extends \Twig_Node
|
|||||||
->write("\$asset->set_path(\$local_file, true);\n")
|
->write("\$asset->set_path(\$local_file, true);\n")
|
||||||
->outdent()
|
->outdent()
|
||||||
->write("}\n")
|
->write("}\n")
|
||||||
->write("\$asset->add_assets_version('{$config['assets_version']}');\n")
|
->outdent()
|
||||||
|
->write("}\n")
|
||||||
|
->write("\n")
|
||||||
|
->write("if (\$asset->is_relative()) {\n")
|
||||||
|
->indent()
|
||||||
|
->write("\$asset->add_assets_version('{$config['assets_version']}');\n")
|
||||||
->outdent()
|
->outdent()
|
||||||
->write("}\n")
|
->write("}\n")
|
||||||
->write("\$this->getEnvironment()->get_assets_bag()->add_{$this->get_setters_name()}(\$asset);")
|
->write("\$this->getEnvironment()->get_assets_bag()->add_{$this->get_setters_name()}(\$asset);")
|
||||||
|
Reference in New Issue
Block a user