From: Marcin Haba <marcin.haba@bacula.pl>
Date: Sun, 24 May 2020 20:43:16 +0000 (+0200)
Subject: baculum: Fix returning value in TStyleDiff - generated notice with PHP 7.4
X-Git-Tag: Release-9.6.4~26
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=281c9dbd4bea9bf4ca715ef0489f2367976e2408;p=thirdparty%2Fbacula.git

baculum: Fix returning value in TStyleDiff - generated notice with PHP 7.4

See https://www.php.net/manual/de/migration74.incompatible.php#migration74.incompatible.core.non-array-access
---

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
index 000000000..7cbc2bfec
--- /dev/null
+++ b/gui/baculum/debian/patches/fix-returning-value-in-tstylediff.patch
@@ -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;
+ 			}
+ 		}
+ 	}
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 9b57d3184..8519e5bb3 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;
 			}
 		}
 	}