Hotfix for incorrectly clearing display cache

xibosignage/xibo#806
dasgarner · Jun 6, 2016 · 24d2b00 · 24d2b00
1 parent 85a6d37
commit 24d2b00
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/lib/pages/display.class.php b/lib/pages/display.class.php
@@ -965,6 +965,9 @@ public function SetMemberOf()
             trigger_error(__('Error getting Display Groups'), E_USER_ERROR);
         }
 
+        // Track whether we have made a change
+        $changed = false;
+
         while($row = $db->get_assoc_row($resultIn))
         {
             // Test whether this ID is in the array or not
@@ -978,6 +981,8 @@ public function SetMemberOf()
                 {
                     trigger_error($displayGroupObject->GetErrorMessage(), E_USER_ERROR);
                 }
+
+                $changed = true;
             }
             else
             {
@@ -994,9 +999,15 @@ public function SetMemberOf()
                 {
                     trigger_error($displayGroupObject->GetErrorMessage(), E_USER_ERROR);
                 }
+
+                $changed = true;
             }
         }
 
+        if ($changed)
+            // Clear the cache for that displayId
+            PDOConnect::getPool()->getItem('display/' . $displayID)->clear();
+
         $response->SetFormSubmitResponse(__('Group membership set'), false);
         $response->Respond();
     }

diff --git a/lib/pages/displaygroup.class.php b/lib/pages/displaygroup.class.php
@@ -479,7 +479,7 @@ public function SetMembers()
                 }
 
                 // Clear the cache for that displayId
-                PDOConnect::getPool()->getItem('/display' . $displayID)->clear();
+                PDOConnect::getPool()->getItem('display/' . $displayID)->clear();
             }
             else
             {
@@ -498,7 +498,7 @@ public function SetMembers()
                 }
 
                 // Clear the cache for that displayId
-                PDOConnect::getPool()->getItem('/display' . $displayID)->clear();
+                PDOConnect::getPool()->getItem('display/' . $displayID)->clear();
             }
         }