Finish env + slaves. Fixes #35

algolia · Oct 27, 2015 · 7104405 · 7104405
1 parent 0c53970
commit 7104405
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/src/AlgoliaEloquentTrait.php b/src/AlgoliaEloquentTrait.php
@@ -147,19 +147,22 @@ public function _setSettings()
         $slaves_settings = $modelHelper->getSlavesSettings($this);
         $slaves = isset($settings['slaves']) ? $settings['slaves'] : [];
 
-        $b = count($slaves) > 0;
+        $b = true;
 
         /** @var \AlgoliaSearch\Index $index */
         foreach ($indices as $index) {
-            if ($b) {
+
+            if ($b && isset($settings['slaves'])) {
                 $settings['slaves'] = array_map(function ($indexName) use ($modelHelper) {
                     return $modelHelper->getFinalIndexName($this, $indexName);
                 }, $settings['slaves']);
             }
 
-            $index->setSettings($settings);
+            if (count(array_keys($settings)) > 0) {
+                $index->setSettings($settings);
+            }
 
-            if ($b) {
+            if ($b && isset($settings['slaves'])) {
                 $b = false;
                 unset($settings['slaves']);
             }
@@ -171,7 +174,8 @@ public function _setSettings()
 
                 $s = array_merge($settings, $slaves_settings[$slave]);
 
-                $index->setSettings($s);
+                if (count(array_keys($s)) > 0)
+                    $index->setSettings($s);
             }
         }
     }