Skip to content

Commit 11ed24b

Browse files
committed
fixes agriya#1 : Object creation has been changed.
1 parent 844a3bc commit 11ed24b

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

app/Console/Command/CmsShell.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public function data()
5252
$connection = 'default';
5353
$records = array();
5454
App::import('Model', 'CakeSchema', false);
55-
$schema = &new CakeSchema(array(
55+
$schema = new CakeSchema(array(
5656
'name' => 'app',
5757
'file' => $this->args['1'] . '_schema.php',
5858
));
@@ -61,7 +61,7 @@ public function data()
6161
// get records
6262
$modelAlias = Inflector::camelize(Inflector::singularize($table));
6363
App::import('Model', 'Model', false);
64-
$model = &new Model(array(
64+
$model = new Model(array(
6565
'name' => $modelAlias,
6666
'table' => $table,
6767
'ds' => $connection

app/Model/Behavior/BayesianAverageableBehavior.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -368,7 +368,7 @@ function &__getExtraModel($modelName)
368368
trigger_error("BayesianAverage Error: no such model: '{$modelName}'", E_USER_NOTICE);
369369
}
370370
}
371-
$this->__extraModels[$modelName] = &new $modelName();
371+
$this->__extraModels[$modelName] = new $modelName();
372372
}
373373
return $this->__extraModels[$modelName];
374374
}

app/Plugin/Extensions/Controller/ExtensionsThemesController.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ public function admin_delete($alias = null)
117117
APP . 'View' . DS . 'Themed' . DS . $alias . DS,
118118
);
119119
$error = 0;
120-
$folder = &new Folder;
120+
$folder = new Folder;
121121
foreach($paths as $path) {
122122
if (is_dir($path)) {
123123
if (!$folder->delete($path)) {

app/Plugin/Install/Controller/InstallController.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,7 @@ public function data()
261261
if ($db->config['datasource'] == 'Database/Postgres') {
262262
$schema_file = 'postgres';
263263
}
264-
$schema = &new CakeSchema(array(
264+
$schema = new CakeSchema(array(
265265
'name' => 'app',
266266
'file' => $schema_file . '_schema.php',
267267
));
@@ -287,7 +287,7 @@ public function data()
287287
$table = $classVars['table'];
288288
$records = $classVars['records'];
289289
App::import('Model', 'Model', false);
290-
$modelObject = &new Model(array(
290+
$modelObject = new Model(array(
291291
'name' => $modelAlias,
292292
'table' => $table,
293293
'ds' => 'default',
@@ -320,7 +320,7 @@ public function configuration()
320320
$this->set('title_for_layout', __l('Installation: Settings Configuration'));
321321
if (!empty($this->request->data)) {
322322
App::import('Model', 'Model', false);
323-
$modelObject = &new Model(array(
323+
$modelObject = new Model(array(
324324
'name' => 'Setting',
325325
'table' => 'settings',
326326
'ds' => 'default',

0 commit comments

Comments
 (0)