Merge branch 'master' into multi-server

2015-12-09 10:43:38 -05:00 · 2015-12-09 10:43:38 -05:00 · 6cfd993890
parent 39e396eb6e 53dec9f26d
commit 6cfd993890
1 changed files with 1 additions and 1 deletions
--- a/web/includes/actions.php
+++ b/web/includes/actions.php
@ -767,7 +767,7 @@ if ( !empty($action) )
    // System edit actions
    if ( canEdit( 'System' ) )
    {
-		if ( $_REQUEST['object'] == 'server' ) {
+		if ( isset( $_REQUEST['object'] ) and ( $_REQUEST['object'] == 'server' ) ) {

 			if ( $action == "Save" ) {
 				if ( !empty($_REQUEST['id']) )