Merge branch 'develop' into 'develop'

Till Brehm · Till Brehm · commit f586f50c8fe0 · 2024-06-16T07:57:18.000Z
Fix PHP warning and update number of class update

See merge request ispconfig/ispconfig3!1918
diff --git a/install/patches/upd_0100.php b/install/patches/upd_0100.php
@@ -2,7 +2,7 @@
 
 if(!defined('INSTALLER_RUN')) die('Patch update file access violation.');
 
-class upd_0099 extends installer_patch_update {
+class upd_0100 extends installer_patch_update {
 
 	public function onAfterSQL() {
 		global $inst;
@@ -12,7 +12,6 @@ public function onAfterSQL() {
             unlink('/usr/local/ispconfig/server/plugins-available/nginx_reverseproxy_plugin.inc.php');
         if(!is_link('/usr/local/ispconfig/server/plugins-enabled/bind_dlz_plugin.inc.php'))
             unlink('/usr/local/ispconfig/server/plugins-available/bind_dlz_plugin.inc.php');
-		
 	}
 
 }

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`if(!defined('INSTALLER_RUN')) die('Patch update file access violation.');`
`4`	`4`
`5`		`-class upd_0099 extends installer_patch_update {`
	`5`	`+class upd_0100 extends installer_patch_update {`
`6`	`6`
`7`	`7`	`public function onAfterSQL() {`
`8`	`8`	`global $inst;`
`@@ -12,7 +12,6 @@ public function onAfterSQL() {`
`12`	`12`	`unlink('/usr/local/ispconfig/server/plugins-available/nginx_reverseproxy_plugin.inc.php');`
`13`	`13`	`if(!is_link('/usr/local/ispconfig/server/plugins-enabled/bind_dlz_plugin.inc.php'))`
`14`	`14`	`unlink('/usr/local/ispconfig/server/plugins-available/bind_dlz_plugin.inc.php');`
`15`		`-`
`16`	`15`	`}`
`17`	`16`
`18`	`17`	`}`