Permalink
Browse files

Removing use of e() from core classes. Refs #6525

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8250 3807eeeb-6ff5-0310-8944-8be069107fe0
  • Loading branch information...
1 parent e382f53 commit 93d64c4e7659ded05f94e2b799477f7fcb985a6e @markstory markstory committed Jul 23, 2009
@@ -952,11 +952,11 @@ function queryAssociation(&$model, &$linkModel, $type, $association, $assocData,
if ($query = $this->generateAssociationQuery($model, $linkModel, $type, $association, $assocData, $queryData, $external, $resultSet)) {
if (!isset($resultSet) || !is_array($resultSet)) {
if (Configure::read() > 0) {
- e('<div style = "font: Verdana bold 12px; color: #FF0000">' . sprintf(__('SQL Error in model %s:', true), $model->alias) . ' ');
+ echo '<div style = "font: Verdana bold 12px; color: #FF0000">' . sprintf(__('SQL Error in model %s:', true), $model->alias) . ' ';
if (isset($this->error) && $this->error != null) {
- e($this->error);
+ echo $this->error;
}
- e('</div>');
+ echo '</div>';
}
return null;
}
@@ -742,11 +742,11 @@ function queryAssociation(&$model, &$linkModel, $type, $association, $assocData,
if ($query = $this->generateAssociationQuery($model, $linkModel, $type, $association, $assocData, $queryData, $external, $resultSet)) {
if (!isset($resultSet) || !is_array($resultSet)) {
if (Configure::read() > 0) {
- e('<div style = "font: Verdana bold 12px; color: #FF0000">' . sprintf(__('SQL Error in model %s:', true), $model->alias) . ' ');
+ echo '<div style = "font: Verdana bold 12px; color: #FF0000">' . sprintf(__('SQL Error in model %s:', true), $model->alias) . ' ';
if (isset($this->error) && $this->error != null) {
- e($this->error);
+ echo $this->error;
}
- e('</div>');
+ echo '</div>';
}
return null;
}
@@ -958,7 +958,7 @@ function afterRender() {
$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 @@ function afterRender() {
$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();
}
}
@@ -1,2 +1,2 @@
-<?php e($xml->header()); ?>
+<?php echo $xml->header(); ?>
<?php echo $content_for_layout; ?>

0 comments on commit 93d64c4

Please sign in to comment.