diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2020-03-10 07:06:19 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2020-03-10 07:08:54 +0000 |
| commit | a1ec71eb2fda83d721e61ee87651c4f6a9f8eff7 (patch) | |
| tree | 25936670797002dd0aacb6bb8c4c3230c06d2359 /community/cacti/Fix-one-minor-error-on-upgrade.patch | |
| parent | 1b80c14e734bb2de206aa19ba8a9fb34e96cfcb4 (diff) | |
| download | aports-a1ec71eb2fda83d721e61ee87651c4f6a9f8eff7.tar.bz2 aports-a1ec71eb2fda83d721e61ee87651c4f6a9f8eff7.tar.xz | |
community/cacti: backport fix in installer
ref https://github.com/Cacti/cacti/issues/3330
fixes #11287
Diffstat (limited to 'community/cacti/Fix-one-minor-error-on-upgrade.patch')
| -rw-r--r-- | community/cacti/Fix-one-minor-error-on-upgrade.patch | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/community/cacti/Fix-one-minor-error-on-upgrade.patch b/community/cacti/Fix-one-minor-error-on-upgrade.patch new file mode 100644 index 0000000000..34437fa08a --- /dev/null +++ b/community/cacti/Fix-one-minor-error-on-upgrade.patch @@ -0,0 +1,22 @@ +From 8e687065b7f456f969cccad97e2c55e5609638cd Mon Sep 17 00:00:00 2001 +From: TheWitness <thewitness@cacti.net> +Date: Sat, 7 Mar 2020 15:39:15 -0500 +Subject: [PATCH] Fix one minor error on upgrade + +--- + lib/installer.php | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/lib/installer.php b/lib/installer.php +index 1deaee79f..5df797b77 100644 +--- a/lib/installer.php ++++ b/lib/installer.php +@@ -2957,6 +2957,8 @@ private function installTemplate() { + } else { + log_install_always('', __('No templates were selected for import')); + } ++ ++ return ''; + } + + private function installPoller() { |