From 813749e909e6581ca2502f928c53411ee6b3d14c Mon Sep 17 00:00:00 2001 From: Sean Harvey Date: Sun, 12 May 2013 21:25:47 +1200 Subject: [PATCH] Fixing array to string conversion in dev/build for PHP 5.4 --- core/model/Database.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/core/model/Database.php b/core/model/Database.php index 82dfcb143..f7148e756 100755 --- a/core/model/Database.php +++ b/core/model/Database.php @@ -390,13 +390,14 @@ abstract class SS_Database { } } } - + + $spec_msg = DB::getConn()->convertIndexSpec($spec); + if($newTable || !isset($this->indexList[$table][$index_alt])) { $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)) { $this->transAlterIndex($table, $index, $spec); - $spec_msg=DB::getConn()->convertIndexSpec($spec); $this->alterationMessage("Index $table.$index: changed to $spec_msg (from {$array_spec})","changed"); } }