Version 5.0.0 beta 5
This commit is contained in:
1 parent
2f24f9de48
commit
57d9db6ce2
218 files changed
+5331
-7416
No files matched your search
@@ -1559,7 +1559,6 @@ class databases extends Controller
|
||||
}
|
||||
$pageValues['page_folder_id'] = $pageValues['page_folder_id'] ?: 0;
|
||||
$pageValues['page_name'] = $pageValues['page_name'] ?: $values['database_name'];
|
||||
$pageValues['page_show_sidebar'] = true;
|
||||
$pageValues['page_ipb_wrapper'] = true;
|
||||
|
||||
if( $currentPage = $current->page )
|
||||
@@ -1741,7 +1740,7 @@ class databases extends Controller
|
||||
|
||||
foreach( Page::formElements( $current?->page ) as $name => $field )
|
||||
{
|
||||
if( !in_array( $name, [ 'tab_details', 'tab_content', 'page_content', 'page_ipb_wrapper', 'page_show_sidebar', 'page_wrapper_template', 'page_theme', 'page_template' ] ) )
|
||||
if( !in_array( $name, [ 'tab_details', 'tab_content', 'page_content', 'page_ipb_wrapper', 'page_wrapper_template', 'page_theme', 'page_template' ] ) )
|
||||
{
|
||||
if ( is_array( $field ) )
|
||||
{
|
||||
|
||||
@@ -257,16 +257,20 @@ FILE;
|
||||
*/
|
||||
protected function delete() : void
|
||||
{
|
||||
/* Database pages cannot be deleted from here */
|
||||
if( isset( static::$pageToDatabaseMap[ Request::i()->id ] ) )
|
||||
/* Check if we are working with a page or a folder */
|
||||
if( isset( Request::i()->subnode ) and Request::i()->subnode )
|
||||
{
|
||||
Output::i()->error( Member::loggedIn()->language()->addToStack( 'content_acp_err_page_db_delete' ), '3T260/1', 403 );
|
||||
}
|
||||
/* Database pages cannot be deleted from here */
|
||||
if( isset( static::$pageToDatabaseMap[ Request::i()->id ] ) )
|
||||
{
|
||||
Output::i()->error( Member::loggedIn()->language()->addToStack( 'content_acp_err_page_db_delete' ), '3T260/1', 403 );
|
||||
}
|
||||
|
||||
if ( isset( Request::i()->id ) )
|
||||
{
|
||||
Session::i()->csrfCheck();
|
||||
Page::deleteCompiled( Request::i()->id );
|
||||
if ( isset( Request::i()->id ) )
|
||||
{
|
||||
Session::i()->csrfCheck();
|
||||
Page::deleteCompiled( Request::i()->id );
|
||||
}
|
||||
}
|
||||
|
||||
parent::delete();
|
||||
|
||||
Reference in new issue
Block a user