From 94e5730b4168aa24a22c7c65c3f314ad06fcc6a3 Mon Sep 17 00:00:00 2001 From: phpnut Date: Sat, 5 Nov 2005 20:35:43 +0000 Subject: [PATCH] [1335] Author: phpnut Date: 2:11:57 PM, Saturday, November 05, 2005 Message: Fixing Controller::generateFieldNames() to work with changes to Model [1334] Author: phpnut Date: 1:18:02 PM, Saturday, November 05, 2005 Message: More work on changes made in the model to allow association names to be used as an alias. These changes are being made to update scaffold to work with changes in [1330]. Added var $alias that holds an array with the key value pair of the table name and the association name. [1330] Author: phpnut Date: 10:25:16 PM, Friday, November 04, 2005 Message: Adding fix for Ticket #127. The query returns properly now but, this breaks scaffold which I will be fixing soon. Also the save methods for the model have not been tested but I am sure these need to be corrected also. git-svn-id: https://svn.cakephp.org/repo/trunk/cake@1336 3807eeeb-6ff5-0310-8944-8be069107fe0 --- cake/libs/controller/controller.php | 21 ++-- cake/libs/controller/scaffold.php | 36 +++--- .../controller/templates/scaffolds/list.thtml | 6 +- .../controller/templates/scaffolds/show.thtml | 28 ++--- cake/libs/model/model.php | 106 +++++++++--------- cake/libs/session.php | 2 + .../libs/view/templates/layouts/default.thtml | 2 +- 7 files changed, 106 insertions(+), 95 deletions(-) diff --git a/cake/libs/controller/controller.php b/cake/libs/controller/controller.php index c27fdfb55..cb9f564a9 100644 --- a/cake/libs/controller/controller.php +++ b/cake/libs/controller/controller.php @@ -564,6 +564,7 @@ class Controller extends Object $model = $this->modelClass; $modelKey = $this->modelKey; $table = $this->{$model}->table; + $association = array_search($table,$this->{$model}->alias); $classRegistry =& ClassRegistry::getInstance(); $objRegistryModel = $classRegistry->getObject($modelKey); @@ -580,12 +581,13 @@ class Controller extends Object $fieldNames[ $tabl['name'] ]['prompt'] = Inflector::humanize($niceName); // this is a foreign key, also set up the other controller $fieldNames[ $tabl['name'] ]['table'] = Inflector::pluralize($niceName); + $association = array_search($fieldNames[ $tabl['name'] ]['table'],$this->{$model}->alias); if($this->{$model}->tableToModel[$fieldNames[ $tabl['name'] ]['table']] == $model) { $alias = 'Child_'; } $fieldNames[ $tabl['name'] ]['prompt'] = Inflector::humanize($alias.$niceName); - $fieldNames[ $tabl['name'] ]['model'] = $alias.$this->{$model}->tableToModel[$fieldNames[ $tabl['name'] ]['table']]; + $fieldNames[ $tabl['name'] ]['model'] = $alias.$association; $fieldNames[ $tabl['name'] ]['modelKey'] = $this->{$model}->tableToModel[$fieldNames[ $tabl['name'] ]['table']]; $fieldNames[ $tabl['name'] ]['controller'] = Inflector::pluralize($this->{$model}->tableToModel[Inflector::pluralize($niceName)]); $fieldNames[ $tabl['name'] ]['foreignKey'] = true; @@ -666,14 +668,15 @@ class Controller extends Object { foreach( $pass as $key=>$value ) { - if( $alias.$key == $fieldNames[ $tabl['name']]['model'] && isset( $value['id'] ) && isset( $value[$otherDisplayField] ) ) + + if( $alias.$key == $this->{$model}->tableToModel[$fieldNames[ $tabl['name'] ]['table']] && isset( $value['id'] ) && isset( $value[$otherDisplayField] ) ) { $fieldNames[ $tabl['name']]['options'][$value['id']] = $value[$otherDisplayField]; } } } } - $fieldNames[ $tabl['name']]['selected'] = $data[$table][$tabl['name']]; + $fieldNames[ $tabl['name']]['selected'] = $data[$association][$tabl['name']]; } } else @@ -728,7 +731,7 @@ class Controller extends Object { foreach( $pass as $key=>$value ) { - if( $alias.$key == $fieldNames[ $tabl['name']]['model'] && isset( $value['id'] ) && isset( $value[$otherDisplayField] ) ) + if( $alias.$key == $this->{$model}->tableToModel[$fieldNames[ $tabl['name'] ]['table']] && isset( $value['id'] ) && isset( $value[$otherDisplayField] ) ) { $fieldNames[ $tabl['name']]['options'][$value['id']] = $value[$otherDisplayField]; } @@ -779,8 +782,8 @@ class Controller extends Object // loop through the many to many relations to make a list box. foreach( $objRegistryModel->_manyToMany as $relation ) { - list($modelName) = $relation; - + //list($modelName) = $relation; + list($manyAssociation, $modelName, $value) = $relation; $modelKeyM = Inflector::underscore($modelName); $modelObject = new $modelName(); @@ -790,7 +793,7 @@ class Controller extends Object $fieldNames[$modelKeyM]['model'] = $modelName; $fieldNames[$modelKeyM]['prompt'] = "Related ".Inflector::humanize(Inflector::pluralize($modelName)); $fieldNames[$modelKeyM]['type'] = "selectMultiple"; - $fieldNames[$modelKeyM]['tagName'] = $modelName.'/'.$modelName; + $fieldNames[$modelKeyM]['tagName'] = $manyAssociation.'/'.$manyAssociation; foreach( $modelObject->findAll() as $pass ) { @@ -802,9 +805,9 @@ class Controller extends Object } } } - if( isset( $data[$modelName] ) ) + if( isset( $data[$manyAssociation] ) ) { - foreach( $data[$modelName] as $key => $row ) + foreach( $data[$manyAssociation] as $key => $row ) { $fieldNames[$modelKeyM]['selected'][$row['id']] = $row['id']; } diff --git a/cake/libs/controller/scaffold.php b/cake/libs/controller/scaffold.php index f0328ea6d..9d83a8534 100644 --- a/cake/libs/controller/scaffold.php +++ b/cake/libs/controller/scaffold.php @@ -409,45 +409,45 @@ class Scaffold extends Object { */ function _cleanUpFields() { - $modelKey = Inflector::underscore($this->modelKey); + foreach( $this->controllerClass->{$this->modelKey}->_tableInfo as $table ) { foreach ($table as $field) { - if('date' == $field['type'] && isset($this->controllerClass->params['data'][$modelKey][$field['name'].'_year'])) + if('date' == $field['type'] && isset($this->controllerClass->params['data'][$this->modelKey][$field['name'].'_year'])) { $newDate = mktime( 0,0,0, - $this->controllerClass->params['data'][$modelKey][$field['name'].'_month'], - $this->controllerClass->params['data'][$modelKey][$field['name'].'_day'], - $this->controllerClass->params['data'][$modelKey][$field['name'].'_year'] ); + $this->controllerClass->params['data'][$this->modelKey][$field['name'].'_month'], + $this->controllerClass->params['data'][$this->modelKey][$field['name'].'_day'], + $this->controllerClass->params['data'][$this->modelKey][$field['name'].'_year'] ); $newDate = date( 'Y-m-d', $newDate ); - $this->controllerClass->params['data'][$modelKey][$field['name']] = $newDate; + $this->controllerClass->params['data'][$this->modelKey][$field['name']] = $newDate; } - else if( 'datetime' == $field['type'] && isset($this->controllerClass->params['data'][$modelKey][$field['name'].'_year'] ) ) + else if( 'datetime' == $field['type'] && isset($this->controllerClass->params['data'][$this->modelKey][$field['name'].'_year'] ) ) { - $hour = $this->controllerClass->params['data'][$modelKey][$field['name'].'_hour']; - if( $hour != 12 && 'pm' == $this->controllerClass->params['data'][$modelKey][$field['name'].'_meridian'] ) + $hour = $this->controllerClass->params['data'][$this->modelKey][$field['name'].'_hour']; + if( $hour != 12 && 'pm' == $this->controllerClass->params['data'][$this->modelKey][$field['name'].'_meridian'] ) { $hour = $hour + 12; } $newDate = mktime( $hour, - $this->controllerClass->params['data'][$modelKey][$field['name'].'_min'],0, - $this->controllerClass->params['data'][$modelKey][$field['name'].'_month'], - $this->controllerClass->params['data'][$modelKey][$field['name'].'_day'], - $this->controllerClass->params['data'][$modelKey][$field['name'].'_year'] ); + $this->controllerClass->params['data'][$this->modelKey][$field['name'].'_min'],0, + $this->controllerClass->params['data'][$this->modelKey][$field['name'].'_month'], + $this->controllerClass->params['data'][$this->modelKey][$field['name'].'_day'], + $this->controllerClass->params['data'][$this->modelKey][$field['name'].'_year'] ); $newDate = date( 'Y-m-d H:i:s', $newDate ); - $this->controllerClass->params['data'][$modelKey][$field['name']] = $newDate; + $this->controllerClass->params['data'][$this->modelKey][$field['name']] = $newDate; } else if( 'tinyint(1)' == $field['type'] ) { - if( isset( $this->controllerClass->params['data'][$modelKey][$field['name']]) && - "on" == $this->controllerClass->params['data'][$modelKey][$field['name']] ) + if( isset( $this->controllerClass->params['data'][$this->modelKey][$field['name']]) && + "on" == $this->controllerClass->params['data'][$this->modelKey][$field['name']] ) { - $this->controllerClass->params['data'][$modelKey][$field['name']] = true; + $this->controllerClass->params['data'][$this->modelKey][$field['name']] = true; } else { - $this->controllerClass->params['data'][$modelKey][$field['name']] = false; + $this->controllerClass->params['data'][$this->modelKey][$field['name']] = false; } } } diff --git a/cake/libs/controller/templates/scaffolds/list.thtml b/cake/libs/controller/templates/scaffolds/list.thtml index 2e1e533ee..467aec324 100644 --- a/cake/libs/controller/templates/scaffolds/list.thtml +++ b/cake/libs/controller/templates/scaffolds/list.thtml @@ -61,17 +61,17 @@ getObject( $otherModelKey ); + $alias = array_search($value['table'],$this->controller->{$model}->alias); if( is_object($otherModelObject) ) { - $displayText = $row[$value['model']][ $otherModelObject->getDisplayField() ]; + $displayText = $row[$alias][ $otherModelObject->getDisplayField() ]; } else{ - $displayText = $row[$value['model']][$field]; + $displayText = $row[$alias][$field]; } echo $html->linkTo( $displayText, "/".Inflector::underscore($otherControllerName)."/show/".$row[$modelKey][$field] ); diff --git a/cake/libs/controller/templates/scaffolds/show.thtml b/cake/libs/controller/templates/scaffolds/show.thtml index 284eda4b6..962225516 100644 --- a/cake/libs/controller/templates/scaffolds/show.thtml +++ b/cake/libs/controller/templates/scaffolds/show.thtml @@ -44,10 +44,10 @@ echo "
".$value['prompt']."
"; if(isset($value['foreignKey'])) { - + $alias = array_search($value['table'],$objModel->alias); $otherModelObject = $registry->getObject(Inflector::underscore($objModel->tableToModel[$value['table']])); $displayField = $otherModelObject->getDisplayField(); - $displayText = $data[$objModel->tableToModel[$value['table']]][$displayField]; + $displayText = $data[$alias][$displayField]; if(!empty($data[$objModel->tableToModel[$objModel->table]][$field])) { @@ -84,7 +84,7 @@ foreach( $fieldNames as $field => $value ) { if( isset( $value['foreignKey'] ) ) { - echo "
  • ".$html->linkTo( "View ".Inflector::humanize($value['controller']), "/".Inflector::underscore($value['controller'])."/show/".$data[$objModel->tableToModel[$value['table']]]['id'] )."
    • "; + echo "
  • ".$html->linkTo( "View ".Inflector::humanize($value['controller']), "/".Inflector::underscore($value['controller'])."/show/".$data[$alias]['id'] )."
    • "; } } ?> @@ -94,15 +94,15 @@ _oneToOne as $relation) { - list($model, $value) = $relation; + list($association, $model, $value) = $relation; $otherModelName = $objModel->tableToModel[$model]; $controller = Inflector::pluralize($model); - echo "

    Related ".Inflector::humanize($otherModelName)."

    "; + echo "

    Related ".Inflector::humanize($association)."

    "; echo "
    "; - if( isset($data[$otherModelName]) && is_array($data[$otherModelName]) ) + if( isset($data[$association]) && is_array($data[$association]) ) { - foreach( $data[$otherModelName] as $field=>$value ) + foreach( $data[$association] as $field=>$value ) { echo "
    ".Inflector::humanize($field)."
    "; if( !empty($value) ) @@ -115,7 +115,7 @@ } echo "
    "; - echo "
    • ".$html->linkTo('Edit '.Inflector::humanize($otherModelName),"/".Inflector::underscore($controller)."/edit/{$data[$otherModelName]['id']}")."
    "; + echo "
    "; } ?> @@ -134,13 +134,13 @@ foreach( $relations as $relation ) { - list($model, $value) = $relation; + list($association, $model, $value) = $relation; $count = 0; $otherModelName = Inflector::singularize($model); $controller = Inflector::pluralize($model); - echo "

    Related ".Inflector::humanize(Inflector::pluralize($objModel->tableToModel[$objModel->{$model}->table]))."

    "; - if( isset($data[$objModel->tableToModel[$objModel->{$model}->table]]) && is_array($data[$objModel->tableToModel[$objModel->{$model}->table]]) ) + echo "

    Related ".Inflector::humanize(Inflector::pluralize($association))."

    "; + if( isset($data[$association]) && is_array($data[$association]) ) { ?> @@ -149,7 +149,7 @@ tableToModel[$objModel->{$model}->table]][0] as $column=>$value ) { + foreach( $data[$association][0] as $column=>$value ) { echo "".Inflector::humanize($column).""; } ?> @@ -157,7 +157,7 @@ tableToModel[$objModel->$model->table]] as $row ) + foreach( $data[$association] as $row ) { echo ""; foreach( $row as $column=>$value ) @@ -180,7 +180,7 @@ ".$html->linkTo('New '.Inflector::humanize($otherModelName),"/".Inflector::underscore($controller)."/add/").""; + echo "
  • ".$html->linkTo('New '.Inflector::humanize($association),"/".Inflector::underscore($controller)."/add/")."
    • "; // echo "
  • ".$html->linkTo( "View ".Inflector::humanize($table), "/".Inflector::underscore($table)."/list/".$modelName."/".$data[$modelName]['id'])."
    • "; ?>
    diff --git a/cake/libs/model/model.php b/cake/libs/model/model.php index f2f051c63..b6b4d9129 100644 --- a/cake/libs/model/model.php +++ b/cake/libs/model/model.php @@ -189,6 +189,13 @@ class Model extends Object */ var $tableToModel = array(); +/** + * Enter description here... + * + * @var unknown_type + */ + var $alias = array(); + /** * Constructor. Binds the Model's database table to the object. * @@ -287,7 +294,7 @@ class Model extends Object foreach ($this->belongsTo as $association => $associationValue) { $className = $association; - $this->_associationSwitch($className, $associationValue, 'Belongs'); + $this->_associationSwitch($association, $className, $associationValue, 'Belongs'); } } else @@ -296,7 +303,7 @@ class Model extends Object foreach ($association as $className) { $this->_constructAssociatedModels($className , 'Belongs'); - $this->linkAssociation('Belongs', $className, $this->id); + $this->linkAssociation('Belongs', $className, $className, $this->id); } } } @@ -313,7 +320,7 @@ class Model extends Object foreach ($this->hasOne as $association => $associationValue) { $className = $association; - $this->_associationSwitch($className, $associationValue, 'One'); + $this->_associationSwitch($className, $className, $associationValue, 'One'); } } else @@ -322,7 +329,7 @@ class Model extends Object foreach ($association as $className) { $this->_constructAssociatedModels($className , 'One'); - $this->linkAssociation('One', $className, $this->id); + $this->linkAssociation('One', $className, $className, $this->id); } } } @@ -339,7 +346,7 @@ class Model extends Object foreach ($this->hasMany as $association => $associationValue) { $className = $association; - $this->_associationSwitch($className, $associationValue, 'Many'); + $this->_associationSwitch($association, $className, $associationValue, 'Many'); } } else @@ -348,7 +355,7 @@ class Model extends Object foreach ($association as $className) { $this->_constructAssociatedModels($className , 'Many'); - $this->linkAssociation('Many', $className, $this->id); + $this->linkAssociation('Many', $className, $className, $this->id); } } } @@ -365,7 +372,7 @@ class Model extends Object foreach ($this->hasAndBelongsToMany as $association => $associationValue) { $className = $association; - $this->_associationSwitch($className, $associationValue, 'ManyTo'); + $this->_associationSwitch($association, $className, $associationValue, 'ManyTo'); } } else @@ -374,7 +381,7 @@ class Model extends Object foreach ($association as $className) { $this->_constructAssociatedModels($className , 'ManyTo'); - $this->linkAssociation('ManyTo', $className, $this->id); + $this->linkAssociation('ManyTo', $className, $className, $this->id); } } } @@ -387,7 +394,7 @@ class Model extends Object * @param unknown_type $type * @access private */ - function _associationSwitch($className, $associationValue, $type) + function _associationSwitch($association, $className, $associationValue, $type) { $classCreated = false; @@ -463,7 +470,7 @@ class Model extends Object break; } } - $this->linkAssociation($type, $className, $this->id); + $this->linkAssociation($type, $association, $className, $this->id); } /** @@ -543,24 +550,28 @@ class Model extends Object * @param unknown_type $tableName * @param unknown_type $value */ - function linkAssociation ($type, $model, $value=null) + function linkAssociation ($type, $association, $model, $value=null) { switch ($type) { case 'Belongs': - $this->_belongsToOther[] = array($model, $value); + $this->alias[$association] = $this->{$model}->table; + $this->_belongsToOther[] = array($association, $model, $value); break; case 'One': - $this->_oneToOne[] = array($model, $value); + $this->alias[$association] = $this->{$model}->table; + $this->_oneToOne[] = array($association, $model, $value); break; case 'Many': - $this->_oneToMany[] = array($model, $value); + $this->alias[$association] = $this->{$model}->table; + $this->_oneToMany[] = array($association, $model, $value); break; case 'ManyTo': - $this->_manyToMany[] = array($model, $value); + $this->alias[$association] = $this->{$model}->table; + $this->_manyToMany[] = array($association, $model, $value); break; } } @@ -728,7 +739,7 @@ class Model extends Object */ function saveField($name, $value) { - return Model::save(array($this->table=>array($name=>$value)), false); + return Model::save(array($this->name=>array($name=>$value)), false); } /** @@ -1041,16 +1052,16 @@ class Model extends Object { foreach ($this->_oneToOne as $rule) { - list($model, $value) = $rule; + list($association, $model, $value) = $rule; if(!empty($this->{$model}->{$this->currentModel.'_foreignkey'})) { if($this->name == $this->{$model}->name) { - $alias = 'Child_'.$this->{$model}->name; + $alias = 'Child_'.$association; } else { - $alias = $this->{$model}->name; + $alias = $association; } $oneToOneConditions = $this->parseConditions($this->{$model}->{$this->currentModel.'_conditions'}); $oneToOneOrder = $this->{$model}->{$this->currentModel.'_order'}; @@ -1067,17 +1078,16 @@ class Model extends Object { foreach ($this->_belongsToOther as $rule) { - list($model, $value) = $rule; - + list($association, $model, $value) = $rule; if(!empty($this->{$model}->{$this->currentModel.'_foreignkey'})) { if($this->name == $this->{$model}->name) { - $alias = 'Child_'.$this->{$model}->name; + $alias = 'Child_'.$association; } else { - $alias = $this->{$model}->name; + $alias = $association; } $belongsToOtherConditions = $this->parseConditions($this->{$model}->{$this->currentModel.'_conditions'}); $belongsToOtherOrder = $this->{$model}->{$this->currentModel.'_order'}; @@ -1141,8 +1151,7 @@ class Model extends Object foreach ($this->_oneToMany as $rule) { $count = 0; - list($model, $value) = $rule; - + list($association, $model, $value) = $rule; foreach ($datacheck as $key => $value1) { foreach ($value1 as $key2 => $value2) @@ -1158,24 +1167,24 @@ class Model extends Object $oneToManyConditions = $this->parseConditions($this->{$model}->{$this->currentModel.'_conditions'}); $oneToManyOrder = $this->{$model}->{$this->currentModel.'_order'}; - $tmpSQL = "SELECT {$this->{$model}->{$this->currentModel.'_fields'}} FROM {$this->{$model}->table} AS `{$this->{$model}->name}` + $tmpSQL = "SELECT {$this->{$model}->{$this->currentModel.'_fields'}} FROM {$this->{$model}->table} AS `{$association}` WHERE ({$this->{$model}->{$this->currentModel.'_foreignkey'}}) = '{$value2['id']}'" .($oneToManyConditions? " WHERE {$oneToManyConditions}":null) .($oneToManyOrder? " ORDER BY {$oneToManyOrder}": null); } - $oneToManySelect[$this->{$model}->name] = $this->db->all($tmpSQL); + $oneToManySelect[$association] = $this->db->all($tmpSQL); - if( !empty($oneToManySelect[$this->{$model}->name]) && is_array($oneToManySelect[$this->{$model}->name])) + if( !empty($oneToManySelect[$association]) && is_array($oneToManySelect[$association])) { - $newKey = $this->{$model}->name; - foreach ($oneToManySelect[$this->{$model}->name] as $key => $value) + $newKey = $association; + foreach ($oneToManySelect[$association] as $key => $value) { $oneToManySelect1[$newKey][$key] = $value[$newKey]; } $merged = array_merge_recursive($data[$count],$oneToManySelect1); $newdata[$count] = $merged; - unset( $oneToManySelect[$this->{$model}->name], $oneToManySelect1); + unset( $oneToManySelect[$association], $oneToManySelect1); } if(!empty($newdata[$count])) { @@ -1219,8 +1228,7 @@ class Model extends Object foreach ($this->_manyToMany as $rule) { $count = 0; - list($model, $value) = $rule; - + list($association, $model, $value) = $rule; foreach ($datacheck as $key => $value1) { foreach ($value1 as $key2 => $value2) @@ -1240,29 +1248,29 @@ class Model extends Object $manyToManyConditions = $this->parseConditions($this->{$model}->{$this->currentModel.'_conditions'}); $manyToManyOrder = $this->{$model}->{$this->currentModel.'_order'}; - $tmpSQL = "SELECT {$this->{$model}->{$this->currentModel.'_fields'}} FROM {$this->{$model}->table} AS `{$this->{$model}->name}` + $tmpSQL = "SELECT {$this->{$model}->{$this->currentModel.'_fields'}} FROM {$this->{$model}->table} AS `{$association}` JOIN {$this->{$model}->{$this->currentModel.'_jointable'}} ON {$this->{$model}->{$this->currentModel.'_jointable'}}. {$this->{$model}->{$this->currentModel.'_foreignkey'}} = '$value2[id]' AND {$this->{$model}->{$this->currentModel.'_jointable'}}. - {$this->{$model}->{$this->currentModel.'_associationforeignkey'}} = `{$this->{$model}->name}` .id" + {$this->{$model}->{$this->currentModel.'_associationforeignkey'}} = `{$association}` .id" .($manyToManyConditions? " WHERE {$manyToManyConditions}":null) .($manyToManyOrder? " ORDER BY {$manyToManyOrder}": null); } - $manyToManySelect[$this->{$model}->name] = $this->db->all($tmpSQL); + $manyToManySelect[$association] = $this->db->all($tmpSQL); } - if( !empty($manyToManySelect[$this->{$model}->name]) && is_array($manyToManySelect[$this->{$model}->name])) + if( !empty($manyToManySelect[$association]) && is_array($manyToManySelect[$association])) { - $newKey = $this->{$model}->name; - foreach ($manyToManySelect[$this->{$model}->name] as $key => $value) + $newKey = $association; + foreach ($manyToManySelect[$association] as $key => $value) { $manyToManySelect1[$newKey][$key] = $value[$newKey]; } $merged = array_merge_recursive($data[$count],$manyToManySelect1); $newdata[$count] = $merged; - unset( $manyToManySelect[$this->{$model}->name], $manyToManySelect1 ); + unset( $manyToManySelect[$association], $manyToManySelect1 ); } if(!empty($newdata[$count])) { @@ -1273,22 +1281,20 @@ class Model extends Object } $count++; } - if(empty($newValue2) && !empty($original)) + if(empty($newValue) && !empty($original)) { - for ($i = 0; $i< count($original); $i++) + $originalCount = count($original); + for ($i = 0; $i< $originalCount; $i++) { - $newValue2[$i] = $original[$i]; - } - if(count($this->_manyToMany < 2)) - { - $newValue = $newValue2; + $newValue[$i] = $original[$i]; } } elseif(!empty($original)) { - for ($i = 0; $i< count($original); $i++) + $originalCount = count($original); + for ($i = 0; $i< $originalCount; $i++) { - $newValue[$i] = array_merge($newValue2[$i], $original[$i]); + $newValue[$i] = array_merge($newValue[$i], $original[$i]); } } } @@ -1481,7 +1487,7 @@ class Model extends Object foreach ($this->_belongsToOther as $rule) { - list($model, $value) = $rule; + list($association, $model, $value) = $rule; $foreignKeys[$this->{$model}->{$this->currentModel.'_foreignkey'}] = $this->{$model}->{$this->currentModel.'_foreignkey'}; } } diff --git a/cake/libs/session.php b/cake/libs/session.php index 0dc98990e..631c90bb3 100644 --- a/cake/libs/session.php +++ b/cake/libs/session.php @@ -367,6 +367,7 @@ class CakeSession extends Object ini_set('session.name', CAKE_SESSION_COOKIE); ini_set('session.cookie_lifetime', $this->cookieLifeTime); ini_set('session.cookie_path', $this->path); + ini_set('session.gc_probability', 1); ini_set('session.gc_maxlifetime', Security::inactiveMins() * 60); break; default : @@ -380,6 +381,7 @@ class CakeSession extends Object ini_set('session.name', CAKE_SESSION_COOKIE); ini_set('session.cookie_lifetime', $this->cookieLifeTime); ini_set('session.cookie_path', $this->path); + ini_set('session.gc_probability', 1); ini_set('session.gc_maxlifetime', Security::inactiveMins() * 60); } break; diff --git a/cake/libs/view/templates/layouts/default.thtml b/cake/libs/view/templates/layouts/default.thtml index 681eaeade..1d59e05e6 100644 --- a/cake/libs/view/templates/layouts/default.thtml +++ b/cake/libs/view/templates/layouts/default.thtml @@ -42,7 +42,7 @@
    - controller->Session)){$this->controller->Session->flash();} ?> + controller->Session->flash(); ?>