]> git.ipfire.org Git - thirdparty/bacula.git/commitdiff
baculum: Fix returning value in TStyleDiff - generated notice with PHP 7.4
authorMarcin Haba <marcin.haba@bacula.pl>
Sun, 24 May 2020 20:43:16 +0000 (22:43 +0200)
committerMarcin Haba <marcin.haba@bacula.pl>
Sun, 24 May 2020 20:43:16 +0000 (22:43 +0200)
See https://www.php.net/manual/de/migration74.incompatible.php#migration74.incompatible.core.non-array-access

gui/baculum/debian/patches/fix-returning-value-in-tstylediff.patch [new file with mode: 0644]
gui/baculum/framework/pradosoft/prado/framework/Web/UI/ActiveControls/TStyleDiff.php

diff --git a/gui/baculum/debian/patches/fix-returning-value-in-tstylediff.patch b/gui/baculum/debian/patches/fix-returning-value-in-tstylediff.patch
new file mode 100644 (file)
index 0000000..7cbc2bf
--- /dev/null
@@ -0,0 +1,13 @@
+diff --git a/gui/baculum/framework/pradosoft/prado/framework/Web/UI/ActiveControls/TStyleDiff.php b/gui/baculum/framework/pradosoft/prado/framework/Web/UI/ActiveControls/TStyleDiff.php
+index 9b57d31845..8519e5bb36 100644
+--- a/gui/baculum/framework/pradosoft/prado/framework/Web/UI/ActiveControls/TStyleDiff.php
++++ b/gui/baculum/framework/pradosoft/prado/framework/Web/UI/ActiveControls/TStyleDiff.php
+@@ -100,7 +100,7 @@ class TStyleDiff extends TViewStateDiff
+                       if (($css !== null) || ($style !== null)) {
+                               return ['CssClass' => $css, 'Style' => $style];
+                       } else {
+-                              $this->_null;
++                              return $this->_null;
+                       }
+               }
+       }
index 9b57d31845264f68d7e8895683463be0c95f9708..8519e5bb3679ed05004ea2700eee56db195ada47 100644 (file)
@@ -100,7 +100,7 @@ class TStyleDiff extends TViewStateDiff
                        if (($css !== null) || ($style !== null)) {
                                return ['CssClass' => $css, 'Style' => $style];
                        } else {
-                               $this->_null;
+                               return $this->_null;
                        }
                }
        }