Fixed #4391 Do not add monit files for hhvm in other PHP modes.

Till Brehm · Till Brehm · commit 5d05ccb623b4 · 2017-01-22T17:05:40.000+01:00
diff --git a/server/plugins-available/apache2_plugin.inc.php b/server/plugins-available/apache2_plugin.inc.php
@@ -3013,7 +3013,7 @@ private function hhvm_update($data, $web_config) {
 			$monit_content = file_get_contents($conf['rootpath'] . '/conf/hhvm_monit.master');
 		}
 		
-		if($data['new']['php'] == 'hhvm' && $data['old']['php'] != 'hhvm' || (isset($data['old']['custom_php_ini']) && $data['new']['custom_php_ini'] != $data['old']['custom_php_ini'])) {
+		if($data['new']['php'] == 'hhvm' && $data['old']['php'] != 'hhvm' || ($data['new']['php'] == 'hhvm' && isset($data['old']['custom_php_ini']) && $data['new']['custom_php_ini'] != $data['old']['custom_php_ini'])) {
 
 			// Custom php.ini settings
 			$custom_php_ini_settings = trim($data['new']['custom_php_ini']);
diff --git a/server/plugins-available/nginx_plugin.inc.php b/server/plugins-available/nginx_plugin.inc.php
@@ -2628,7 +2628,7 @@ private function hhvm_update($data, $web_config) {
 			$monit_content = file_get_contents($conf['rootpath'] . '/conf/hhvm_monit.master');
 		}
 		
-		if($data['new']['php'] == 'hhvm' && $data['old']['php'] != 'hhvm' || (isset($data['old']['custom_php_ini']) && isset($data['new']['custom_php_ini']) && $data['new']['custom_php_ini'] != $data['old']['custom_php_ini'])) {
+		if($data['new']['php'] == 'hhvm' && $data['old']['php'] != 'hhvm' || ($data['new']['php'] == 'hhvm' && isset($data['old']['custom_php_ini']) && isset($data['new']['custom_php_ini']) && $data['new']['custom_php_ini'] != $data['old']['custom_php_ini'])) {
 
 			// Custom php.ini settings
 			$custom_php_ini_settings = trim($data['new']['custom_php_ini']);

Original file line number	Diff line number	Diff line change
`@@ -3013,7 +3013,7 @@ private function hhvm_update($data, $web_config) {`
`3013`	`3013`	`$monit_content = file_get_contents($conf['rootpath'] . '/conf/hhvm_monit.master');`
`3014`	`3014`	`}`
`3015`	`3015`
`3016`		`- if($data['new']['php'] == 'hhvm' && $data['old']['php'] != 'hhvm' \|\| (isset($data['old']['custom_php_ini']) && $data['new']['custom_php_ini'] != $data['old']['custom_php_ini'])) {`
	`3016`	`+ if($data['new']['php'] == 'hhvm' && $data['old']['php'] != 'hhvm' \|\| ($data['new']['php'] == 'hhvm' && isset($data['old']['custom_php_ini']) && $data['new']['custom_php_ini'] != $data['old']['custom_php_ini'])) {`
`3017`	`3017`
`3018`	`3018`	`// Custom php.ini settings`
`3019`	`3019`	`$custom_php_ini_settings = trim($data['new']['custom_php_ini']);`
Original file line number	Diff line number	Diff line change
`@@ -2628,7 +2628,7 @@ private function hhvm_update($data, $web_config) {`
`2628`	`2628`	`$monit_content = file_get_contents($conf['rootpath'] . '/conf/hhvm_monit.master');`
`2629`	`2629`	`}`
`2630`	`2630`
`2631`		`- if($data['new']['php'] == 'hhvm' && $data['old']['php'] != 'hhvm' \|\| (isset($data['old']['custom_php_ini']) && isset($data['new']['custom_php_ini']) && $data['new']['custom_php_ini'] != $data['old']['custom_php_ini'])) {`
	`2631`	`+ if($data['new']['php'] == 'hhvm' && $data['old']['php'] != 'hhvm' \|\| ($data['new']['php'] == 'hhvm' && isset($data['old']['custom_php_ini']) && isset($data['new']['custom_php_ini']) && $data['new']['custom_php_ini'] != $data['old']['custom_php_ini'])) {`
`2632`	`2632`
`2633`	`2633`	`// Custom php.ini settings`
`2634`	`2634`	`$custom_php_ini_settings = trim($data['new']['custom_php_ini']);`