diff --git a/cake/libs/model/datasources/dbo/dbo_oracle.php b/cake/libs/model/datasources/dbo/dbo_oracle.php index f7ec6f06e..92ffc76dd 100644 --- a/cake/libs/model/datasources/dbo/dbo_oracle.php +++ b/cake/libs/model/datasources/dbo/dbo_oracle.php @@ -952,11 +952,11 @@ class DboOracle extends DboSource { if ($query = $this->generateAssociationQuery($model, $linkModel, $type, $association, $assocData, $queryData, $external, $resultSet)) { if (!isset($resultSet) || !is_array($resultSet)) { if (Configure::read() > 0) { - e('
' . sprintf(__('SQL Error in model %s:', true), $model->alias) . ' '); + echo '
' . sprintf(__('SQL Error in model %s:', true), $model->alias) . ' '; if (isset($this->error) && $this->error != null) { - e($this->error); + echo $this->error; } - e('
'); + echo '
'; } return null; } diff --git a/cake/libs/model/datasources/dbo_source.php b/cake/libs/model/datasources/dbo_source.php index 8264081d6..318593f95 100644 --- a/cake/libs/model/datasources/dbo_source.php +++ b/cake/libs/model/datasources/dbo_source.php @@ -742,11 +742,11 @@ class DboSource extends DataSource { if ($query = $this->generateAssociationQuery($model, $linkModel, $type, $association, $assocData, $queryData, $external, $resultSet)) { if (!isset($resultSet) || !is_array($resultSet)) { if (Configure::read() > 0) { - e('
' . sprintf(__('SQL Error in model %s:', true), $model->alias) . ' '); + echo '
' . sprintf(__('SQL Error in model %s:', true), $model->alias) . ' '; if (isset($this->error) && $this->error != null) { - e($this->error); + echo $this->error; } - e('
'); + echo '
'; } return null; } diff --git a/cake/libs/view/helpers/ajax.php b/cake/libs/view/helpers/ajax.php index 97d5c9580..ed0de9782 100644 --- a/cake/libs/view/helpers/ajax.php +++ b/cake/libs/view/helpers/ajax.php @@ -958,7 +958,7 @@ class AjaxHelper extends AppHelper { $keys = array_keys($this->__ajaxBuffer); if (count($divs) == 1 && in_array($divs[0], $keys)) { - e($this->__ajaxBuffer[$divs[0]]); + echo $this->__ajaxBuffer[$divs[0]]; } else { foreach ($this->__ajaxBuffer as $key => $val) { if (in_array($key, $divs)) { @@ -969,14 +969,13 @@ class AjaxHelper extends AppHelper { $out .= 'for (n in __ajaxUpdater__) { if (typeof __ajaxUpdater__[n] == "string"'; $out .= ' && $(n)) Element.update($(n), unescape(decodeURIComponent('; $out .= '__ajaxUpdater__[n]))); }'; - e($this->Javascript->codeBlock($out, false)); + echo $this->Javascript->codeBlock($out, false); } $scripts = $this->Javascript->getCache(); if (!empty($scripts)) { - e($this->Javascript->codeBlock($scripts, false)); + echo $this->Javascript->codeBlock($scripts, false); } - $this->_stop(); } } diff --git a/cake/libs/view/layouts/xml/default.ctp b/cake/libs/view/layouts/xml/default.ctp index c68870298..566ca2158 100644 --- a/cake/libs/view/layouts/xml/default.ctp +++ b/cake/libs/view/layouts/xml/default.ctp @@ -1,2 +1,2 @@ -header()); ?> +header(); ?> \ No newline at end of file