mirror of
https://github.com/kamilwylegala/cakephp2-php8.git
synced 2025-01-31 00:48:25 +00:00
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
This commit is contained in:
parent
e382f53ead
commit
93d64c4e76
4 changed files with 10 additions and 11 deletions
|
@ -952,11 +952,11 @@ class DboOracle extends DboSource {
|
||||||
if ($query = $this->generateAssociationQuery($model, $linkModel, $type, $association, $assocData, $queryData, $external, $resultSet)) {
|
if ($query = $this->generateAssociationQuery($model, $linkModel, $type, $association, $assocData, $queryData, $external, $resultSet)) {
|
||||||
if (!isset($resultSet) || !is_array($resultSet)) {
|
if (!isset($resultSet) || !is_array($resultSet)) {
|
||||||
if (Configure::read() > 0) {
|
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) {
|
if (isset($this->error) && $this->error != null) {
|
||||||
e($this->error);
|
echo $this->error;
|
||||||
}
|
}
|
||||||
e('</div>');
|
echo '</div>';
|
||||||
}
|
}
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
|
@ -742,11 +742,11 @@ class DboSource extends DataSource {
|
||||||
if ($query = $this->generateAssociationQuery($model, $linkModel, $type, $association, $assocData, $queryData, $external, $resultSet)) {
|
if ($query = $this->generateAssociationQuery($model, $linkModel, $type, $association, $assocData, $queryData, $external, $resultSet)) {
|
||||||
if (!isset($resultSet) || !is_array($resultSet)) {
|
if (!isset($resultSet) || !is_array($resultSet)) {
|
||||||
if (Configure::read() > 0) {
|
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) {
|
if (isset($this->error) && $this->error != null) {
|
||||||
e($this->error);
|
echo $this->error;
|
||||||
}
|
}
|
||||||
e('</div>');
|
echo '</div>';
|
||||||
}
|
}
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
|
@ -958,7 +958,7 @@ class AjaxHelper extends AppHelper {
|
||||||
$keys = array_keys($this->__ajaxBuffer);
|
$keys = array_keys($this->__ajaxBuffer);
|
||||||
|
|
||||||
if (count($divs) == 1 && in_array($divs[0], $keys)) {
|
if (count($divs) == 1 && in_array($divs[0], $keys)) {
|
||||||
e($this->__ajaxBuffer[$divs[0]]);
|
echo $this->__ajaxBuffer[$divs[0]];
|
||||||
} else {
|
} else {
|
||||||
foreach ($this->__ajaxBuffer as $key => $val) {
|
foreach ($this->__ajaxBuffer as $key => $val) {
|
||||||
if (in_array($key, $divs)) {
|
if (in_array($key, $divs)) {
|
||||||
|
@ -969,14 +969,13 @@ class AjaxHelper extends AppHelper {
|
||||||
$out .= 'for (n in __ajaxUpdater__) { if (typeof __ajaxUpdater__[n] == "string"';
|
$out .= 'for (n in __ajaxUpdater__) { if (typeof __ajaxUpdater__[n] == "string"';
|
||||||
$out .= ' && $(n)) Element.update($(n), unescape(decodeURIComponent(';
|
$out .= ' && $(n)) Element.update($(n), unescape(decodeURIComponent(';
|
||||||
$out .= '__ajaxUpdater__[n]))); }';
|
$out .= '__ajaxUpdater__[n]))); }';
|
||||||
e($this->Javascript->codeBlock($out, false));
|
echo $this->Javascript->codeBlock($out, false);
|
||||||
}
|
}
|
||||||
$scripts = $this->Javascript->getCache();
|
$scripts = $this->Javascript->getCache();
|
||||||
|
|
||||||
if (!empty($scripts)) {
|
if (!empty($scripts)) {
|
||||||
e($this->Javascript->codeBlock($scripts, false));
|
echo $this->Javascript->codeBlock($scripts, false);
|
||||||
}
|
}
|
||||||
|
|
||||||
$this->_stop();
|
$this->_stop();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,2 +1,2 @@
|
||||||
<?php e($xml->header()); ?>
|
<?php echo $xml->header(); ?>
|
||||||
<?php echo $content_for_layout; ?>
|
<?php echo $content_for_layout; ?>
|
Loading…
Add table
Reference in a new issue