diff -r 35380c89b5bf -r 0e2e476e90e8 includes/namespaces/default.php --- a/includes/namespaces/default.php Sun Aug 01 12:41:45 2010 -0400 +++ b/includes/namespaces/default.php Fri Aug 20 01:36:44 2010 -0400 @@ -134,7 +134,7 @@ if ( isset($cdata_cache[$pathskey]) ) { $this->cdata = $cdata_cache[$pathskey]; - $this->exists = $cdata_cache[$pathskey]['page_exists']; + $this->exists =$cdata_cache[$pathskey]['page_exists']; $this->title = $cdata_cache[$pathskey]['name']; return null; } @@ -556,7 +556,7 @@ $standard_404 .= '

' . $lang->get('page_msg_404_title') . '

' . $lang->get('page_msg_404_body'); } - if ( $session->get_permissions('create_page') ) + if ( $session->check_acl_scope('create_page', $this->namespace) && $session->get_permissions('create_page') ) { $standard_404 .= ' ' . $lang->get('page_msg_404_create', array( 'create_flags' => 'href="'.makeUrlNS($this->namespace, $this->page_id, 'do=edit', true).'" onclick="ajaxEditor(); return false;"', @@ -570,7 +570,7 @@ )); } $standard_404 .= '

'; - if ( $session->get_permissions('history_rollback') ) + if ( $session->check_acl_scope('history_rollback', $this->namespace) && $session->get_permissions('history_rollback') ) { $e = $db->sql_query('SELECT * FROM ' . table_prefix . 'logs WHERE action=\'delete\' AND page_id=\'' . $this->page_id . '\' AND namespace=\'' . $this->namespace . '\' ORDER BY time_id DESC;'); if ( !$e ) @@ -761,7 +761,7 @@ $html .= $lang->get('catedit_catbox_lbl_uncategorized'); } - $can_edit = ( $session->get_permissions('edit_cat') && ( !$paths->page_protected || $session->get_permissions('even_when_protected') ) ); + $can_edit = ( $session->check_acl_scope('edit_cat', $this->namespace) && $session->get_permissions('edit_cat') && ( !$paths->page_protected || $session->get_permissions('even_when_protected') ) ); if ( $can_edit ) { $edit_link = '' . $lang->get('catedit_catbox_link_edit') . '';