Merge branch '3.2.x'

This commit is contained in:
Marc Alexander 2018-11-20 20:54:55 +01:00
commit 000f8a27e3
No known key found for this signature in database
GPG key ID: 50E0D2423696F995

View file

@ -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);")