diff --git a/app/Console/Command/AdminShell.php b/app/Console/Command/AdminShell.php
index 5511a846b..5cf3eabba 100644
--- a/app/Console/Command/AdminShell.php
+++ b/app/Console/Command/AdminShell.php
@@ -524,7 +524,7 @@ class AdminShell extends AppShell
$dbVersion = $dbVersion['AdminSetting']['value'];
$data = array(
'schema' => $dbActualSchema['schema'],
- 'indexes' => $dbActualSchema['indexes']
+ 'indexes' => $dbActualSchema['indexes'],
'db_version' => $dbVersion
);
$file = new File(ROOT . DS . 'db_schema.json', true);
diff --git a/app/Model/Server.php b/app/Model/Server.php
index e6aa96d6f..ca8997eda 100644
--- a/app/Model/Server.php
+++ b/app/Model/Server.php
@@ -4640,14 +4640,6 @@ class Server extends AppModel
public function compareDBIndexes($actualIndex, $expectedIndex)
{
- $expectedIndex = $actualIndex;
- unset($actualIndex['decaying_models']);
- unset($actualIndex['feeds'][0]);
- unset($actualIndex['feeds'][1]);
- unset($actualIndex['galaxy_reference'][0]);
- unset($actualIndex['galaxy_reference'][3]);
- unset($actualIndex['notification_logs'][1]);
- unset($expectedIndex['threads'][2]);
$indexDiff = array();
foreach($expectedIndex as $tableName => $indexes) {
if (!array_key_exists($tableName, $actualIndex)) {
diff --git a/app/View/Elements/healthElements/db_indexes_diagnostic.ctp b/app/View/Elements/healthElements/db_indexes_diagnostic.ctp
index c298ed43c..2ae549db5 100644
--- a/app/View/Elements/healthElements/db_indexes_diagnostic.ctp
+++ b/app/View/Elements/healthElements/db_indexes_diagnostic.ctp
@@ -9,44 +9,48 @@
-
-
-
- Table name |
- Column name |
- Indexed |
- Description |
-
-
-
- $columnArray): ?>
-
-
+
+
+
+
+
+
+ Table name |
+ Column name |
+ Indexed |
+ Description |
+
+
+
+ $columnArray): ?>
', $warning ? 'error' : 'indexInfo hidden'),
- sprintf('%s | ', h($columnName)),
- sprintf(' | ', $columnIndexed ? 'green fa-check' : 'red fa-times'),
- sprintf('%s | ', $warning ? h($diagnostic[$tableName][$columnName]) : ''),
- ''
- );
+ $columnCount = 0;
+ $rowHtml = '';
?>
+
+ ', $warning ? 'error' : 'indexInfo hidden'),
+ sprintf('%s | ', h($columnName)),
+ sprintf(' | ', $columnIndexed ? 'green fa-check' : 'red fa-times'),
+ sprintf('%s | ', $warning ? h($diagnostic[$tableName][$columnName]) : ''),
+ ''
+ );
+ ?>
+
+ 0): ?>
+ %s | ', $columnCount+1, h($tableName)); ?>
+
+
- 0): ?>
- %s | ', $columnCount+1, h($tableName)); ?>
-
-
-
-
-
+
+
+