From d7b3104838a63aa25ca67fbbc9d8b89a73ed19d1 Mon Sep 17 00:00:00 2001 From: Andrey Kutejko Date: Tue, 7 May 2013 14:35:05 +0300 Subject: [PATCH] minor style fixes --- ipf/orm/collection.php | 2 +- ipf/template/context/request.php | 9 ++------- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/ipf/orm/collection.php b/ipf/orm/collection.php index e8d05aa..129c512 100644 --- a/ipf/orm/collection.php +++ b/ipf/orm/collection.php @@ -187,7 +187,7 @@ class IPF_ORM_Collection extends IPF_ORM_Access implements Countable, IteratorAg if ($key === null) { $this->data[] = $record; } else { - $this->data[$key] = $record; + $this->data[$key] = $record; } if (isset($this->keyColumn)) { diff --git a/ipf/template/context/request.php b/ipf/template/context/request.php index 0074620..f2c555f 100644 --- a/ipf/template/context/request.php +++ b/ipf/template/context/request.php @@ -7,14 +7,9 @@ class IPF_Template_Context_Request extends IPF_Template_Context $vars = array_merge(array('request' => $request), $vars); foreach (IPF::get('template_context_processors', array()) as $proc) { IPF::loadFunction($proc); - $vars = array_merge($proc($request), $vars); + $vars = array_merge($proc($request), $vars); } - $params = array('request' => $request, - 'context' => $vars); - - //IPF_Signal::send('IPF_Template_Context_Request::construct', - // 'IPF_Template_Context_Request', $params); - $this->_vars = new IPF_Template_ContextVars($params['context']); + parent::__construct($vars); } } -- 2.49.0