Доработка ф-ии component

livestreet · Jan 27, 2015 · 0d4967f · mzhelskiy · Jan 27, 2015 · mzhelskiy
1 parent 806ab88
commit 0d4967f
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/classes/modules/viewer/plugs/function.component.php b/classes/modules/viewer/plugs/function.component.php
@@ -46,13 +46,14 @@ function smarty_function_component($aParams, &$oSmarty)
      */
     $aComponentParams = array();
     if (isset($aParams['params']) and is_array($aParams['params'])) {
-        $aComponentParams = $aParams['params'];
+        $aComponentParams = array_merge($aParams['params'], $aParams);
     } else {
         unset($aParams['component']);
         unset($aParams['_default_short']);
         unset($aParams['template']);
         $aComponentParams = $aParams;
     }
+    $aComponentParams['params'] = $aComponentParams;
     /**
      * Получаем путь до шаблона
      */