diff options
author | anaqreon <tamanning@zoho.com> | 2014-12-30 16:06:35 -0600 |
---|---|---|
committer | anaqreon <tamanning@zoho.com> | 2014-12-30 16:06:35 -0600 |
commit | b78a545a1056e6db9f4b6b4f262182b0a5c56e67 (patch) | |
tree | 515c2f742a5a39e18b00debf1849ee9703fa4a42 /library/Smarty/libs/sysplugins/smarty_internal_compile_config_load.php | |
parent | d67c5a6ffd134602084a6dcb37b316bf768bf715 (diff) | |
parent | 43671a0a323afa758df56c06822ce3c46da026df (diff) | |
download | volse-hubzilla-b78a545a1056e6db9f4b6b4f262182b0a5c56e67.tar.gz volse-hubzilla-b78a545a1056e6db9f4b6b4f262182b0a5c56e67.tar.bz2 volse-hubzilla-b78a545a1056e6db9f4b6b4f262182b0a5c56e67.zip |
Merge pull request #1 from friendica/master
Pull from upstream
Diffstat (limited to 'library/Smarty/libs/sysplugins/smarty_internal_compile_config_load.php')
-rw-r--r-- | library/Smarty/libs/sysplugins/smarty_internal_compile_config_load.php | 31 |
1 files changed, 14 insertions, 17 deletions
diff --git a/library/Smarty/libs/sysplugins/smarty_internal_compile_config_load.php b/library/Smarty/libs/sysplugins/smarty_internal_compile_config_load.php index deaa052c5..8813664d4 100644 --- a/library/Smarty/libs/sysplugins/smarty_internal_compile_config_load.php +++ b/library/Smarty/libs/sysplugins/smarty_internal_compile_config_load.php @@ -1,22 +1,21 @@ <?php /** * Smarty Internal Plugin Compile Config Load - * * Compiles the {config load} tag * - * @package Smarty + * @package Smarty * @subpackage Compiler - * @author Uwe Tews + * @author Uwe Tews */ /** * Smarty Internal Plugin Compile Config Load Class * - * @package Smarty + * @package Smarty * @subpackage Compiler */ -class Smarty_Internal_Compile_Config_Load extends Smarty_Internal_CompileBase { - +class Smarty_Internal_Compile_Config_Load extends Smarty_Internal_CompileBase +{ /** * Attribute definition: Overwrites base class. * @@ -30,7 +29,7 @@ class Smarty_Internal_Compile_Config_Load extends Smarty_Internal_CompileBase { * @var array * @see Smarty_Internal_CompileBase */ - public $shorttag_order = array('file','section'); + public $shorttag_order = array('file', 'section'); /** * Attribute definition: Overwrites base class. * @@ -42,13 +41,14 @@ class Smarty_Internal_Compile_Config_Load extends Smarty_Internal_CompileBase { /** * Compiles code for the {config_load} tag * - * @param array $args array with attributes from parser - * @param object $compiler compiler object + * @param array $args array with attributes from parser + * @param object $compiler compiler object + * * @return string compiled code */ public function compile($args, $compiler) { - static $_is_legal_scope = array('local' => true,'parent' => true,'root' => true,'global' => true); + static $_is_legal_scope = array('local' => true, 'parent' => true, 'root' => true, 'global' => true); // check and get attributes $_attr = $this->getAttributes($compiler, $args); @@ -56,8 +56,7 @@ class Smarty_Internal_Compile_Config_Load extends Smarty_Internal_CompileBase { $compiler->trigger_template_error('nocache option not allowed', $compiler->lex->taglineno); } - - // save posible attributes + // save possible attributes $conf_file = $_attr['file']; if (isset($_attr['section'])) { $section = $_attr['section']; @@ -70,16 +69,14 @@ class Smarty_Internal_Compile_Config_Load extends Smarty_Internal_CompileBase { $_attr['scope'] = trim($_attr['scope'], "'\""); if (isset($_is_legal_scope[$_attr['scope']])) { $scope = $_attr['scope']; - } else { + } else { $compiler->trigger_template_error('illegal value for "scope" attribute', $compiler->lex->taglineno); - } + } } // create config object $_output = "<?php \$_config = new Smarty_Internal_Config($conf_file, \$_smarty_tpl->smarty, \$_smarty_tpl);"; $_output .= "\$_config->loadConfigVars($section, '$scope'); ?>"; + return $_output; } - } - -?>
\ No newline at end of file |