From b95eb5b3428b3dff52423974c2c090beb3f782dd Mon Sep 17 00:00:00 2001
From: Samuel Georges <sam@daftspunk.com>
Date: Tue, 16 Dec 2014 15:18:36 +1100
Subject: [PATCH] setComponentPropertiesFromParameters ->
 setComponentPropertiesFromParams

---
 modules/cms/classes/Controller.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/cms/classes/Controller.php b/modules/cms/classes/Controller.php
index 8a0ee472d..c77027ade 100644
--- a/modules/cms/classes/Controller.php
+++ b/modules/cms/classes/Controller.php
@@ -431,7 +431,7 @@ class Controller extends BaseController
             $this->vars[$alias] = $this->page->components[$alias] = $componentObj;
         }
 
-        $this->setComponentPropertiesFromParameters($componentObj);
+        $this->setComponentPropertiesFromParams($componentObj);
         $componentObj->init();
         $componentObj->onInit(); // Deprecated: Remove ithis line if year >= 2015
         return $componentObj;
@@ -793,7 +793,7 @@ class Controller extends BaseController
                     'obj' => $componentObj
                 ]);
 
-                $this->setComponentPropertiesFromParameters($componentObj, $parameters);
+                $this->setComponentPropertiesFromParams($componentObj, $parameters);
                 $componentObj->init();
                 $componentObj->onInit(); // Deprecated: Remove ithis line if year >= 2015
             }
@@ -1102,7 +1102,7 @@ class Controller extends BaseController
      * @param array $parameters Specifies the partial parameters.
      * @return Returns updated properties.
      */
-    protected function setComponentPropertiesFromParameters($component, $parameters = [])
+    protected function setComponentPropertiesFromParams($component, $parameters = [])
     {
         $properties = $component->getProperties();
         $routerParameters = $this->router->getParameters();