Merge branch 'master' into fix/php-error

rahulsprajapati · rahulsprajapati · commit e3dd9db3db71 · 2018-11-29T12:21:01.000+05:30
diff --git a/admin/class-nginx-helper-admin.php b/admin/class-nginx-helper-admin.php
@@ -316,7 +316,7 @@ public function nginx_helper_settings_link( $links ) {
 			$setting_page = 'options-general.php';
 		}
 
-		$settings_link = '<a href="' . admin_url( $setting_page . '?page=nginx' ) . '">' . __( 'Settings', 'nginx-helper' ) . '</a>';
+		$settings_link = '<a href="' . network_admin_url( $setting_page . '?page=nginx' ) . '">' . __( 'Settings', 'nginx-helper' ) . '</a>';
 		array_unshift( $links, $settings_link );
 
 		return $links;

Original file line number	Diff line number	Diff line change
`@@ -316,7 +316,7 @@ public function nginx_helper_settings_link( $links ) {`
`316`	`316`	`$setting_page = 'options-general.php';`
`317`	`317`	`}`
`318`	`318`
`319`		`- $settings_link = '<a href="' . admin_url( $setting_page . '?page=nginx' ) . '">' . __( 'Settings', 'nginx-helper' ) . '</a>';`
	`319`	`+ $settings_link = '<a href="' . network_admin_url( $setting_page . '?page=nginx' ) . '">' . __( 'Settings', 'nginx-helper' ) . '</a>';`
`320`	`320`	`array_unshift( $links, $settings_link );`
`321`	`321`
`322`	`322`	`return $links;`