Permalink
Browse files

Extend was not taken out in the last few commits....

  • Loading branch information...
1 parent 8c1c1d1 commit 7fb190e152b7d85d63db64513af87fabc64216b9 @durango committed Feb 25, 2012
Showing with 5 additions and 4 deletions.
  1. +2 −2 system/controller.php
  2. +3 −2 system/view.php
View
@@ -62,9 +62,9 @@ public function array_to_xml($array){
$subnode = $xml->addChild($key);
$this->array_to_xml($value);
}
- else {
+ else
$this->array_to_xml($value);
- }}
+ }
else {
if(is_numeric($key)) $key = "Row";
$xml->addChild($key,$value);
View
@@ -59,15 +59,16 @@ public function assign_variables(array $args){
}
public function render($file, array $args = array()){
- $this->assign_variables($args);
if($file instanceof \mvc\web\controller\JSON)
echo json_encode($args);
elseif($file instanceof \mvc\web\controller\XML) {
header('Content-type: text/xml');
echo $file->array_to_xml($args)->asXML();
}
- else
+ else {
+ $this->assign_variables($args);
echo $this->engine->display($file);
+ }
}
}

0 comments on commit 7fb190e

Please sign in to comment.