diff --git a/main/wiki/index.php b/main/wiki/index.php index 994e345c79..32788f99c0 100644 --- a/main/wiki/index.php +++ b/main/wiki/index.php @@ -430,15 +430,13 @@ echo ''; if(api_is_allowed_to_edit(false,true) || api_is_platform_admin()) { // page action: enable or disable the adding of new pages - if (check_addnewpagelock()==1) + if (check_addnewpagelock()==0) { - $protect_addnewpage= ''.get_lang('AddOptionProtected').''; - $lock_unlock_addnew='unlockaddnew'; - + $lock_unlock_addnew='unlockaddnew'; } else - { + { $protect_addnewpage= ''.get_lang('AddOptionUnprotected').''; $lock_unlock_addnew='lockaddnew'; } @@ -1198,7 +1196,7 @@ if ($_GET['action']=='addnew') } } - elseif (check_addnewpagelock()==1 && (api_is_allowed_to_edit(false,true)==false || api_is_platform_admin()==false)) + elseif (check_addnewpagelock()==0 && (api_is_allowed_to_edit(false,true)==false || api_is_platform_admin()==false)) { Display::display_error_message(get_lang('AddPagesLocked')); } diff --git a/main/wiki/wiki.inc.php b/main/wiki/wiki.inc.php index bce9eda23e..d2d1d6956d 100644 --- a/main/wiki/wiki.inc.php +++ b/main/wiki/wiki.inc.php @@ -1068,30 +1068,34 @@ function check_addnewpagelock() $row=Database::fetch_array($result); $status_addlock=$row['addlock']; + //change status if (api_is_allowed_to_edit(false,true) || api_is_platform_admin()) { - if ($_GET['actionpage']=='lockaddnew' && $status_addlock==0) + if ($_GET['actionpage']=='lockaddnew' && $status_addlock==1) { - $status_addlock=1; + $status_addlock=0; } - if ($_GET['actionpage']=='unlockaddnew' && $status_addlock==1) + if ($_GET['actionpage']=='unlockaddnew' && $status_addlock==0) { - $status_addlock=0; + $status_addlock=1; } - + + Database::query('UPDATE '.$tbl_wiki.' SET addlock="'.Database::escape_string($status_addlock).'" WHERE '.$groupfilter.'',__LINE__,__FILE__); $sql='SELECT * FROM '.$tbl_wiki.'WHERE '.$groupfilter.' ORDER BY id ASC'; $result=Database::query($sql,__LINE__,__FILE__); $row=Database::fetch_array($result); + } //show status - return $row['addlock']; + return $row['addlock']; + } @@ -1190,8 +1194,14 @@ function check_visibility_page() } + if(empty($row['id'])) + { + $row['visibility']= 1; + } + + //show status - return $row['visibility']; + return $row['visibility']; }