Merge pull request #64 from dasgarner/develop

Array syntax fix
xibosignage · May 27, 2015 · c0c80dd · c0c80dd
2 parents e32b438 + bda2d35
commit c0c80dd
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 11 deletions.
diff --git a/lib/Helper/Log.php b/lib/Helper/Log.php
@@ -50,13 +50,13 @@ public static function audit($entity, $entityId, $message, $object)
         if (!is_string($object))
             $object = json_encode($object);
 
-        self::$_auditLogStatement->execute([
+        self::$_auditLogStatement->execute(array(
             'logDate' => time(),
             'userId' => \Kit::GetParam('userid', _SESSION, _INT, 0),
             'entity' => $entity,
             'message' => $message,
             'entityId' => $entityId,
             'objectAfter' => $object
-        ]);
+        ));
     }
 }
diff --git a/lib/data/campaign.data.class.php b/lib/data/campaign.data.class.php
@@ -298,7 +298,7 @@ public static function setOwner($campaignId, $userId)
 
         // Get some details about the campaign
         $select = $dbh->prepare('SELECT campaignId, campaign, userId, isLayoutSpecific FROM `campaign` WHERE campaignId = :campaignId');
-        $select->execute(['campaignId' => $campaignId]);
+        $select->execute(array('campaignId' => $campaignId));
 
         if (!$row = $select->fetch(PDO::FETCH_ASSOC))
             throw new Exception('Unable to find Campaign/Layout');
@@ -314,7 +314,7 @@ public static function setOwner($campaignId, $userId)
 
         // Should we also update the layout?
         if ($row['isLayoutSpecific'] == 1) {
-            $layouts = Layout::Entries(null, ['layoutSpecificCampaignId' => $campaignId]);
+            $layouts = Layout::Entries(null, array('layoutSpecificCampaignId' => $campaignId));
 
             if (count($layouts) <= 0)
                 throw new Exception('Unable to find Layout');

diff --git a/lib/data/display.data.class.php b/lib/data/display.data.class.php
@@ -392,7 +392,7 @@ public function Delete($displayID)
                     'displayid' => $displayID
                 ));
 
-            \Xibo\Helper\Log::audit('Display', $displayID, 'Display Deleted', ['displayId' => $displayID]);
+            \Xibo\Helper\Log::audit('Display', $displayID, 'Display Deleted', array('displayId' => $displayID));
 
             return true;
         }

diff --git a/lib/data/schedule.data.class.php b/lib/data/schedule.data.class.php
@@ -246,7 +246,7 @@ public function Delete($eventID)
                     'eventid' => $eventID
                 ));
 
-            \Xibo\Helper\Log::audit('Schedule', $eventID, 'Schedule Event Deleted', ['eventId' => $eventID]);
+            \Xibo\Helper\Log::audit('Schedule', $eventID, 'Schedule Event Deleted', array('eventId' => $eventID));
 
             return true;  
         }

diff --git a/lib/data/usergroup.data.class.php b/lib/data/usergroup.data.class.php
@@ -469,7 +469,7 @@ public static function isQuotaFullByUser($userId)
             ORDER BY `group`.isUserSpecific DESC, IFNULL(group.libraryQuota, 0) DESC
         ');
 
-        $quotaSth->execute(['userId' => $userId]);
+        $quotaSth->execute(array('userId' => $userId));
 
         // Loop over until we have a quota
         $rows = $quotaSth->fetchAll(PDO::FETCH_ASSOC);
@@ -499,7 +499,7 @@ public static function isQuotaFullByUser($userId)
               ON lkusergroup.userId = media.userId
            WHERE lkusergroup.groupId = :groupId
           ');
-        $sth->execute(['groupId' => $groupId]);
+        $sth->execute(array('groupId' => $groupId));
 
         if (!$row = $sth->fetch())
             throw new Exception("Error Processing Request", 1);
@@ -526,7 +526,7 @@ public static function getLibraryQuota($groupId)
              WHERE group.groupId = :groupId
         ');
 
-        $quotaSth->execute(['groupId' => $groupId]);
+        $quotaSth->execute(array('groupId' => $groupId));
 
         if (!$row = $quotaSth->fetch()) {
             throw new Exception('Problem getting this users library quota.');
@@ -549,6 +549,6 @@ public static function updateLibraryQuota($groupId, $libraryQuota)
              WHERE groupId = :groupId
         ');
 
-        $sth->execute(['libraryQuota' => $libraryQuota, 'groupId' => $groupId]);
+        $sth->execute(array('libraryQuota' => $libraryQuota, 'groupId' => $groupId));
     }
 }
diff --git a/maintenance.php b/maintenance.php
@@ -273,7 +273,7 @@
                             break;
 
                         echo sprintf(__('Disabling %s'), $display['display']) . '<br/>' . PHP_EOL;
-                        $update->execute(['displayId' => $display['displayId']]);
+                        $update->execute(array('displayId' => $display['displayId']));
 
                         $difference--;
                     }