tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

Fixing array to string conversion in dev/build for PHP 5.4

Browse Source
This commit is contained in:
Sean Harvey 2013-05-12 21:25:47 +12:00
parent a2394331af
commit 813749e909
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/model/Database.php
View File

@ -390,13 +390,14 @@ abstract class SS_Database {
} }
} }
} }
$spec_msg = DB::getConn()->convertIndexSpec($spec);
if($newTable || !isset($this->indexList[$table][$index_alt])) { if($newTable || !isset($this->indexList[$table][$index_alt])) {
$this->transCreateIndex($table, $index, $spec); $this->transCreateIndex($table, $index, $spec);
$this->alterationMessage("Index $table.$index: created as $spec","created"); $this->alterationMessage("Index $table.$index: created as $spec_msg","created");
} else if($array_spec != DB::getConn()->convertIndexSpec($spec)) { } else if($array_spec != DB::getConn()->convertIndexSpec($spec)) {
$this->transAlterIndex($table, $index, $spec); $this->transAlterIndex($table, $index, $spec);
$spec_msg=DB::getConn()->convertIndexSpec($spec);
$this->alterationMessage("Index $table.$index: changed to $spec_msg <i style=\"color: #AAA\">(from {$array_spec})</i>","changed"); $this->alterationMessage("Index $table.$index: changed to $spec_msg <i style=\"color: #AAA\">(from {$array_spec})</i>","changed");
} }
} }