diff --git a/cake/libs/cake_session.php b/cake/libs/cake_session.php index 387f6088a..1b29f0779 100644 --- a/cake/libs/cake_session.php +++ b/cake/libs/cake_session.php @@ -746,7 +746,7 @@ class CakeSession extends Object { return false; } - return $row[$model->alias]['data']; + return $row[$model->alias]['data']; } /** diff --git a/cake/libs/controller/components/request_handler.php b/cake/libs/controller/components/request_handler.php index 7a1988f43..88b31cd1c 100644 --- a/cake/libs/controller/components/request_handler.php +++ b/cake/libs/controller/components/request_handler.php @@ -581,7 +581,7 @@ class RequestHandlerComponent extends Object { } elseif (count($types) === 1) { return ($types[0] === $accepts[0]); } elseif (count($accepts) === 1) { - return $accepts[0]; + return $accepts[0]; } $acceptedTypes = array(); diff --git a/cake/libs/debugger.php b/cake/libs/debugger.php index 46ab2c322..8f39f4a3b 100644 --- a/cake/libs/debugger.php +++ b/cake/libs/debugger.php @@ -165,7 +165,6 @@ class Debugger extends Object { $this->_templates['js']['code'] = '
_templates['js']['code'] .= 'style="display: none;">
{:code}
'; - $e = '
{:error} ({:code}) : {:description} ';
 		$e .= '[{:path}, line {:line}]
'; $this->_templates['html']['error'] = $e; diff --git a/cake/libs/model/cake_schema.php b/cake/libs/model/cake_schema.php index 1a6f72587..865dcc517 100644 --- a/cake/libs/model/cake_schema.php +++ b/cake/libs/model/cake_schema.php @@ -367,7 +367,6 @@ class CakeSchema extends Object { } $out .="}\n"; - $File =& new File($path . DS . $file, true); $header = '$Id'; $content = ""; diff --git a/cake/libs/model/datasources/dbo/dbo_oracle.php b/cake/libs/model/datasources/dbo/dbo_oracle.php index 54f2811da..307058784 100644 --- a/cake/libs/model/datasources/dbo/dbo_oracle.php +++ b/cake/libs/model/datasources/dbo/dbo_oracle.php @@ -204,10 +204,11 @@ class DboOracle extends DboSource { } return $this->connected; } - /** - * Keeps track of the most recent Oracle error - * - */ + +/** + * Keeps track of the most recent Oracle error + * + */ function _setError($source = null, $clear = false) { if ($source) { $e = ocierror($source); @@ -1072,7 +1073,6 @@ class DboOracle extends DboSource { $q = str_replace('= (', 'IN (', $q); $q = str_replace(' WHERE 1 = 1', '', $q); - $q = $this->insertQueryData($q, null, $association, $assocData, $model, $linkModel, $stack); if ($q != false) { $res = $this->fetchAll($q, $model->cacheQueries, $model->alias); @@ -1142,14 +1142,15 @@ class DboOracle extends DboSource { } } } - /** - * Generate a "drop table" statement for the given Schema object - * - * @param object $schema An instance of a subclass of CakeSchema - * @param string $table Optional. If specified only the table name given will be generated. - * Otherwise, all tables defined in the schema are generated. - * @return string - */ + +/** + * Generate a "drop table" statement for the given Schema object + * + * @param object $schema An instance of a subclass of CakeSchema + * @param string $table Optional. If specified only the table name given will be generated. + * Otherwise, all tables defined in the schema are generated. + * @return string + */ function dropSchema($schema, $table = null) { if (!is_a($schema, 'CakeSchema')) { trigger_error(__('Invalid schema object', true), E_USER_WARNING); diff --git a/cake/libs/multibyte.php b/cake/libs/multibyte.php index 2d5814153..fe8c7f4f4 100644 --- a/cake/libs/multibyte.php +++ b/cake/libs/multibyte.php @@ -1063,7 +1063,7 @@ class Multibyte extends Object { * @return string * @access private */ - function __codepoint ($decimal) { + function __codepoint($decimal) { if ($decimal > 128 && $decimal < 256) { $return = '0080_00ff'; // Latin-1 Supplement } elseif ($decimal < 384) { diff --git a/cake/libs/security.php b/cake/libs/security.php index 72513fcd8..680a06914 100644 --- a/cake/libs/security.php +++ b/cake/libs/security.php @@ -45,12 +45,12 @@ class Security extends Object { var $hashType = null; /** - * Singleton implementation to get object instance. - * - * @return object - * @access public - * @static - */ + * Singleton implementation to get object instance. + * + * @return object + * @access public + * @static + */ function &getInstance() { static $instance = array(); if (!$instance) { @@ -60,12 +60,12 @@ class Security extends Object { } /** - * Get allowed minutes of inactivity based on security level. - * - * @return integer Allowed inactivity in minutes - * @access public - * @static - */ + * Get allowed minutes of inactivity based on security level. + * + * @return integer Allowed inactivity in minutes + * @access public + * @static + */ function inactiveMins() { $_this =& Security::getInstance(); switch (Configure::read('Security.level')) { @@ -83,12 +83,12 @@ class Security extends Object { } /** - * Generate authorization hash. - * - * @return string Hash - * @access public - * @static - */ + * Generate authorization hash. + * + * @return string Hash + * @access public + * @static + */ function generateAuthKey() { if (!class_exists('String')) { App::import('Core', 'String'); diff --git a/cake/libs/set.php b/cake/libs/set.php index 0d103986e..d1fea29b2 100644 --- a/cake/libs/set.php +++ b/cake/libs/set.php @@ -422,7 +422,7 @@ class Set extends Object { $context['key'] = array_pop($context['trace']); if (isset($context['trace'][1]) && $context['trace'][1] > 0) { $context['item'] = $context['item'][0]; - } else if(!empty($context['item'][$key])){ + } elseif (!empty($context['item'][$key])) { $context['item'] = $context['item'][$key]; } else { $context['item'] = array_shift($context['item']); diff --git a/cake/libs/validation.php b/cake/libs/validation.php index a33e2d9a8..fd2606c5f 100644 --- a/cake/libs/validation.php +++ b/cake/libs/validation.php @@ -778,7 +778,7 @@ class Validation extends Object { * @return boolean Success * @access public */ - function range($check, $lower = null, $upper = null ) { + function range($check, $lower = null, $upper = null) { if (!is_numeric($check)) { return false; } diff --git a/cake/libs/view/helpers/ajax.php b/cake/libs/view/helpers/ajax.php index 708a89b87..479f04df4 100644 --- a/cake/libs/view/helpers/ajax.php +++ b/cake/libs/view/helpers/ajax.php @@ -508,7 +508,6 @@ class AjaxHelper extends AppHelper { $options = $this->_optionsToString($options, array('paramName', 'indicator')); $options = $this->_buildOptions($options, $this->autoCompleteOptions); - $text = $this->Form->text($field, $htmlOptions); $div = $this->Html->div(null, '', $divOptions); $script = "{$var}new Ajax.Autocompleter('{$htmlOptions['id']}', '{$divOptions['id']}', '"; @@ -903,7 +902,7 @@ class AjaxHelper extends AppHelper { $callback = $this->remoteFunction($options); $hasFrequency = !(!isset($options['frequency']) || intval($options['frequency']) == 0); - $frequency = $hasFrequency ? $options['frequency'] . ', ' : ''; + $frequency = $hasFrequency ? $options['frequency'] . ', ' : ''; return "new $klass('$name', {$frequency}function(element, value) {{$callback}})"; } @@ -1018,5 +1017,4 @@ class AjaxHelper extends AppHelper { } } } - ?> \ No newline at end of file diff --git a/cake/libs/view/helpers/xml.php b/cake/libs/view/helpers/xml.php index 2a2bb3f52..521ee0d91 100644 --- a/cake/libs/view/helpers/xml.php +++ b/cake/libs/view/helpers/xml.php @@ -168,5 +168,4 @@ class XmlHelper extends AppHelper { return $data->toString($options + array('header' => false)); } } - ?> \ No newline at end of file diff --git a/cake/libs/view/theme.php b/cake/libs/view/theme.php index 697328fbb..435d3086c 100644 --- a/cake/libs/view/theme.php +++ b/cake/libs/view/theme.php @@ -58,7 +58,7 @@ class ThemeView extends View { * * @param unknown_type $controller */ - function __construct (&$controller) { + function __construct(&$controller) { parent::__construct($controller); $this->theme =& $controller->theme;