Updating Smarty

1 files changed, 18 insertions, 12 deletions

diff --git a/lib/smarty3/sysplugins/smarty_internal_method_registerdefaulttemplatehandler.php b/lib/smarty3/sysplugins/smarty_internal_method_registerdefaulttemplatehandler.php
index 73e8f62..cbc133c 100644
--- a/lib/smarty3/sysplugins/smarty_internal_method_registerdefaulttemplatehandler.php
+++ b/lib/smarty3/sysplugins/smarty_internal_method_registerdefaulttemplatehandler.php
@@ -21,21 +21,21 @@ class Smarty_Internal_Method_RegisterDefaultTemplateHandler
     /**
      * Register template default handler
      *
-     * @api  Smarty::registerDefaultTemplateHandler()
+     * @api Smarty::registerDefaultTemplateHandler()
      *
      * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
-     * @param  callable                                                       $callback class/method name
+     * @param callable                                                        $callback class/method name
      *
      * @return \Smarty|\Smarty_Internal_Template
      * @throws SmartyException              if $callback is not callable
      */
     public function registerDefaultTemplateHandler(Smarty_Internal_TemplateBase $obj, $callback)
     {
-        $smarty = isset($obj->smarty) ? $obj->smarty : $obj;
+        $smarty = $obj->_getSmartyObj();
         if (is_callable($callback)) {
             $smarty->default_template_handler_func = $callback;
         } else {
-            throw new SmartyException("Default template handler not callable");
+            throw new SmartyException('Default template handler not callable');
         }
         return $obj;
     }
@@ -55,16 +55,20 @@ class Smarty_Internal_Method_RegisterDefaultTemplateHandler
             $default_handler = $source->smarty->default_template_handler_func;
         }
         $_content = $_timestamp = null;
-        $_return = call_user_func_array($default_handler,
-                                        array($source->type, $source->name, &$_content, &$_timestamp, $source->smarty));
+        $_return = call_user_func_array(
+            $default_handler,
+            array($source->type, $source->name, &$_content, &$_timestamp, $source->smarty)
+        );
         if (is_string($_return)) {
             $source->exists = is_file($_return);
             if ($source->exists) {
                 $source->timestamp = filemtime($_return);
             } else {
-                throw new SmartyException("Default handler: Unable to load " .
-                                          ($source->isConfig ? 'config' : 'template') .
-                                          " default file '{$_return}' for '{$source->type}:{$source->name}'");
+                throw new SmartyException(
+                    'Default handler: Unable to load ' .
+                    ($source->isConfig ? 'config' : 'template') .
+                    " default file '{$_return}' for '{$source->type}:{$source->name}'"
+                );
             }
             $source->name = $source->filepath = $_return;
             $source->uid = sha1($source->filepath);
@@ -75,8 +79,10 @@ class Smarty_Internal_Method_RegisterDefaultTemplateHandler
             $source->handler = Smarty_Resource::load($source->smarty, 'eval');
         } else {
             $source->exists = false;
-            throw new SmartyException('Default handler: No ' . ($source->isConfig ? 'config' : 'template') .
-                                      " default content for '{$source->type}:{$source->name}'");
+            throw new SmartyException(
+                'Default handler: No ' . ($source->isConfig ? 'config' : 'template') .
+                " default content for '{$source->type}:{$source->name}'"
+            );
         }
     }
-}
\ No newline at end of file
+}