Updating Smarty

1 files changed, 28 insertions, 16 deletions

diff --git a/lib/smarty3/sysplugins/smarty_internal_method_registerobject.php b/lib/smarty3/sysplugins/smarty_internal_method_registerobject.php
index dcebd92..4646e4f 100644
--- a/lib/smarty3/sysplugins/smarty_internal_method_registerobject.php
+++ b/lib/smarty3/sysplugins/smarty_internal_method_registerobject.php
@@ -25,32 +25,44 @@ class Smarty_Internal_Method_RegisterObject
      * @link http://www.smarty.net/docs/en/api.register.object.tpl
      *
      * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
-     * @param  string                                                         $object_name
-     * @param  object                                                         $object                     the
+     * @param string                                                          $object_name
+     * @param object                                                          $object                     the
      *                                                                                                    referenced
-     *                                                                                                    PHP object to
+     *                                                                                                    PHP
+     *                                                                                                    object
+     *                                                                                                    to
      *                                                                                                    register
-     * @param  array                                                          $allowed_methods_properties list of
+     *
+     * @param array                                                           $allowed_methods_properties list of
      *                                                                                                    allowed
      *                                                                                                    methods
-     *                                                                                                    (empty = all)
-     * @param  bool                                                           $format                     smarty
+     *                                                                                                    (empty
+     *                                                                                                    = all)
+     *
+     * @param bool                                                            $format                     smarty
      *                                                                                                    argument
-     *                                                                                                    format, else
+     *                                                                                                    format,
+     *                                                                                                    else
      *                                                                                                    traditional
-     * @param  array                                                          $block_methods              list of
+     *
+     * @param array                                                           $block_methods              list of
      *                                                                                                    block-methods
      *
      * @return \Smarty|\Smarty_Internal_Template
      * @throws \SmartyException
      */
-    public function registerObject(Smarty_Internal_TemplateBase $obj, $object_name, $object,
-                                   $allowed_methods_properties = array(), $format = true, $block_methods = array())
-    {
-        $smarty = isset($obj->smarty) ? $obj->smarty : $obj;
+    public function registerObject(
+        Smarty_Internal_TemplateBase $obj,
+        $object_name,
+        $object,
+        $allowed_methods_properties = array(),
+        $format = true,
+        $block_methods = array()
+    ) {
+        $smarty = $obj->_getSmartyObj();
         // test if allowed methods callable
         if (!empty($allowed_methods_properties)) {
-            foreach ((array) $allowed_methods_properties as $method) {
+            foreach ((array)$allowed_methods_properties as $method) {
                 if (!is_callable(array($object, $method)) && !property_exists($object, $method)) {
                     throw new SmartyException("Undefined method or property '$method' in registered object");
                 }
@@ -58,7 +70,7 @@ class Smarty_Internal_Method_RegisterObject
         }
         // test if block methods callable
         if (!empty($block_methods)) {
-            foreach ((array) $block_methods as $method) {
+            foreach ((array)$block_methods as $method) {
                 if (!is_callable(array($object, $method))) {
                     throw new SmartyException("Undefined method '$method' in registered object");
                 }
@@ -66,7 +78,7 @@ class Smarty_Internal_Method_RegisterObject
         }
         // register the object
         $smarty->registered_objects[ $object_name ] =
-            array($object, (array) $allowed_methods_properties, (boolean) $format, (array) $block_methods);
+            array($object, (array)$allowed_methods_properties, (boolean)$format, (array)$block_methods);
         return $obj;
     }
-}
\ No newline at end of file
+}