From c39abdf83edba65aea7bf21d4e6b222b2926dd7f Mon Sep 17 00:00:00 2001
From: uwetews <uwe.tews@googlemail.com>
Date: Sat, 20 Aug 2016 14:18:43 +0200
Subject: [PATCH] - bugfix {config_load ... scope="global"} shall not throw an
 arror but fallback to scope="smarty"
 https://github.com/smarty-php/smarty/issues/274

---
 change_log.txt                                          | 3 +++
 libs/Smarty.class.php                                   | 2 +-
 libs/sysplugins/smarty_internal_compile_config_load.php | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/change_log.txt b/change_log.txt
index e19d526a..83e93bae 100644
--- a/change_log.txt
+++ b/change_log.txt
@@ -1,4 +1,7 @@
 ===== 3.1.31-dev ===== (xx.xx.xx)
+ 20.08-2016
+  - bugfix {config_load ... scope="global"} shall not throw an arror but fallback to scope="smarty" https://github.com/smarty-php/smarty/issues/274
+
  14.08.2016
   - bugfix $smarty_>debugging = true; did E_NOTICE messages when {eval} tag was used https://github.com/smarty-php/smarty/issues/266
   - bugfix Class 'Smarty_Internal_Runtime_ValidateCompiled' not found when upgrading from some older Smarty versions with existing
diff --git a/libs/Smarty.class.php b/libs/Smarty.class.php
index e7b071e4..39399010 100644
--- a/libs/Smarty.class.php
+++ b/libs/Smarty.class.php
@@ -121,7 +121,7 @@ class Smarty extends Smarty_Internal_TemplateBase
     /**
      * smarty version
      */
-    const SMARTY_VERSION = '3.1.31-dev/4';
+    const SMARTY_VERSION = '3.1.31-dev/5';
 
     /**
      * define variable scopes
diff --git a/libs/sysplugins/smarty_internal_compile_config_load.php b/libs/sysplugins/smarty_internal_compile_config_load.php
index d59ea3f8..7c6e9b59 100644
--- a/libs/sysplugins/smarty_internal_compile_config_load.php
+++ b/libs/sysplugins/smarty_internal_compile_config_load.php
@@ -55,7 +55,7 @@ class Smarty_Internal_Compile_Config_Load extends Smarty_Internal_CompileBase
      */
     public $valid_scopes = array('local' => Smarty::SCOPE_LOCAL, 'parent' => Smarty::SCOPE_PARENT,
                                  'root' => Smarty::SCOPE_ROOT, 'tpl_root' => Smarty::SCOPE_TPL_ROOT,
-                                 'smarty' => Smarty::SCOPE_SMARTY);
+                                 'smarty' => Smarty::SCOPE_SMARTY, 'global' => Smarty::SCOPE_SMARTY);
 
     /**
      * Compiles code for the {config_load} tag