Merge branch 'hotfix/1.3.7'

terminal42 · Sep 26, 2016 · 682d43d · 682d43d
2 parents c80129f + e7d0e07
commit 682d43d
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 2 deletions.
diff --git a/assets/backend.css b/assets/backend.css
@@ -0,0 +1,3 @@
+#tl_navigation .tl_level_1_group .group-notification_center {
+    background: url(notification.png) 8px center no-repeat;
+}
diff --git a/bin/queue b/bin/queue
@@ -1,5 +1,4 @@
 #!/usr/bin/env php
-
 <?php
 
 /**

diff --git a/config/config.php b/config/config.php
@@ -34,6 +34,11 @@
     )
 ));
 
+// Load icon in Contao 4.2 backend
+if ('BE' === TL_MODE) {
+    $GLOBALS['TL_CSS'][] = 'system/modules/notification_center/assets/backend.css';
+}
+
 /**
  * Front end modules
  */

diff --git a/library/NotificationCenter/Model/Message.php b/library/NotificationCenter/Model/Message.php
@@ -43,7 +43,7 @@ public function send(array $arrTokens, $strLanguage = '')
 
         if (isset($GLOBALS['TL_HOOKS']['sendNotificationMessage']) && is_array($GLOBALS['TL_HOOKS']['sendNotificationMessage'])) {
             foreach ($GLOBALS['TL_HOOKS']['sendNotificationMessage'] as $arrCallback) {
-                $blnSuccess = \System::importStatic($arrCallback[0])->$arrCallback[1]($this, $arrTokens, $strLanguage, $objGatewayModel);
+                $blnSuccess = \System::importStatic($arrCallback[0])->{$arrCallback[1]}($this, $arrTokens, $strLanguage, $objGatewayModel);
 
                 if (!$blnSuccess) {
                     return false;
-Original file line number
+Diff line change
@@ -1,5 +1,4 @@
     #!/usr/bin/env php
     <?php
     /**
@@ Expand Down @@