adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-03-17 15:09:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

whitespace normalization

Browse source
This commit is contained in:
AD7six 2009-07-26 12:46:07 +02:00 • committed by gwoo
parent 993643dd2a
commit a4bc755cc7
12 changed files with 39 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
cake/libs/debugger.php
View file

@ -165,7 +165,6 @@ class Debugger extends Object {
$this->_templates['js']['code'] = '<div id="{:id}-code" class="cake-code-dump" '; $this->_templates['js']['code'] = '<div id="{:id}-code" class="cake-code-dump" ';
$this->_templates['js']['code'] .= 'style="display: none;"><pre>{:code}</pre></div>'; $this->_templates['js']['code'] .= 'style="display: none;"><pre>{:code}</pre></div>';
$e = '<pre class="cake-debug"><b>{:error}</b> ({:code}) : {:description} '; $e = '<pre class="cake-debug"><b>{:error}</b> ({:code}) : {:description} ';
$e .= '[<b>{:path}</b>, line <b>{:line}]</b></pre>'; $e .= '[<b>{:path}</b>, line <b>{:line}]</b></pre>';
$this->_templates['html']['error'] = $e; $this->_templates['html']['error'] = $e;

1
cake/libs/model/cake_schema.php
View file

@ -367,7 +367,6 @@ class CakeSchema extends Object {
} }
$out .="}\n"; $out .="}\n";
$File =& new File($path . DS . $file, true); $File =& new File($path . DS . $file, true);
$header = '$Id'; $header = '$Id';
$content = "<?php \n/* SVN FILE: {$header}$ */\n/* {$name} schema generated on: " . date('Y-m-d H:m:s') . " : ". time() . "*/\n{$out}?>"; $content = "<?php \n/* SVN FILE: {$header}$ */\n/* {$name} schema generated on: " . date('Y-m-d H:m:s') . " : ". time() . "*/\n{$out}?>";

7
cake/libs/model/datasources/dbo/dbo_oracle.php
View file

@ -204,7 +204,8 @@ class DboOracle extends DboSource {
} }
return $this->connected; return $this->connected;
} }
/**
/**
* Keeps track of the most recent Oracle error * Keeps track of the most recent Oracle error
* *
*/ */
@ -1072,7 +1073,6 @@ class DboOracle extends DboSource {
$q = str_replace('= (', 'IN (', $q); $q = str_replace('= (', 'IN (', $q);
$q = str_replace(' WHERE 1 = 1', '', $q); $q = str_replace(' WHERE 1 = 1', '', $q);
$q = $this->insertQueryData($q, null, $association, $assocData, $model, $linkModel, $stack); $q = $this->insertQueryData($q, null, $association, $assocData, $model, $linkModel, $stack);
if ($q != false) { if ($q != false) {
$res = $this->fetchAll($q, $model->cacheQueries, $model->alias); $res = $this->fetchAll($q, $model->cacheQueries, $model->alias);
@ -1142,7 +1142,8 @@ class DboOracle extends DboSource {
} }
} }
} }
/**
/**
* Generate a "drop table" statement for the given Schema object * Generate a "drop table" statement for the given Schema object
* *
* @param object $schema An instance of a subclass of CakeSchema * @param object $schema An instance of a subclass of CakeSchema

2
cake/libs/multibyte.php
View file

@ -1063,7 +1063,7 @@ class Multibyte extends Object {
* @return string * @return string
* @access private * @access private
*/ */
function __codepoint ($decimal) { function __codepoint($decimal) {
if ($decimal > 128 && $decimal < 256) { if ($decimal > 128 && $decimal < 256) {
$return = '0080_00ff'; // Latin-1 Supplement $return = '0080_00ff'; // Latin-1 Supplement
} elseif ($decimal < 384) { } elseif ($decimal < 384) {

2
cake/libs/set.php
View file

@ -422,7 +422,7 @@ class Set extends Object {
$context['key'] = array_pop($context['trace']); $context['key'] = array_pop($context['trace']);
if (isset($context['trace'][1]) && $context['trace'][1] > 0) { if (isset($context['trace'][1]) && $context['trace'][1] > 0) {
$context['item'] = $context['item'][0]; $context['item'] = $context['item'][0];
} else if(!empty($context['item'][$key])){ } elseif (!empty($context['item'][$key])) {
$context['item'] = $context['item'][$key]; $context['item'] = $context['item'][$key];
} else { } else {
$context['item'] = array_shift($context['item']); $context['item'] = array_shift($context['item']);

2
cake/libs/validation.php
View file

@ -778,7 +778,7 @@ class Validation extends Object {
* @return boolean Success * @return boolean Success
* @access public * @access public
*/ */
function range($check, $lower = null, $upper = null ) { function range($check, $lower = null, $upper = null) {
if (!is_numeric($check)) { if (!is_numeric($check)) {
return false; return false;
} }

2
cake/libs/view/helpers/ajax.php
View file

@ -508,7 +508,6 @@ class AjaxHelper extends AppHelper {
$options = $this->_optionsToString($options, array('paramName', 'indicator')); $options = $this->_optionsToString($options, array('paramName', 'indicator'));
$options = $this->_buildOptions($options, $this->autoCompleteOptions); $options = $this->_buildOptions($options, $this->autoCompleteOptions);
$text = $this->Form->text($field, $htmlOptions); $text = $this->Form->text($field, $htmlOptions);
$div = $this->Html->div(null, '', $divOptions); $div = $this->Html->div(null, '', $divOptions);
$script = "{$var}new Ajax.Autocompleter('{$htmlOptions['id']}', '{$divOptions['id']}', '"; $script = "{$var}new Ajax.Autocompleter('{$htmlOptions['id']}', '{$divOptions['id']}', '";
@ -1018,5 +1017,4 @@ class AjaxHelper extends AppHelper {
} }
} }
} }
?> ?>

1
cake/libs/view/helpers/xml.php
View file

@ -168,5 +168,4 @@ class XmlHelper extends AppHelper {
return $data->toString($options + array('header' => false)); return $data->toString($options + array('header' => false));
} }
} }
?> ?>

2
cake/libs/view/theme.php
View file

@ -58,7 +58,7 @@ class ThemeView extends View {
* *
* @param unknown_type $controller * @param unknown_type $controller
*/ */
function __construct (&$controller) { function __construct(&$controller) {
parent::__construct($controller); parent::__construct($controller);
$this->theme =& $controller->theme; $this->theme =& $controller->theme;