Merge branch 'hotfix/1.4.5'

terminal42 · Jun 4, 2018 · 73e91d8 · 73e91d8
2 parents 7085116 + 57ee694
commit 73e91d8
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/classes/tl_nc_message.php b/classes/tl_nc_message.php
@@ -34,11 +34,10 @@ class tl_nc_message extends \Backend
      */
     public function modifyPalette(\DataContainer $dc)
     {
-        if ('edit' !== \Input::get('act')) {
+        if ('edit' !== \Input::get('act') || !$dc->id || ($message = Message::findByPk($dc->id)) === null) {
             return;
         }
 
-        $message = Message::findByPk($dc->id);
         $gateway = $message->getRelated('gateway');
 
         if ($gateway !== null && 'queue' === $gateway->type) {