diff options
| author | spiderr <spiderr@bitweaver.org> | 2021-02-03 16:14:20 -0500 |
|---|---|---|
| committer | spiderr <spiderr@bitweaver.org> | 2021-02-03 16:14:20 -0500 |
| commit | 52d27352cc239299b35d18beffb5bfd38988b31e (patch) | |
| tree | 516ccb3084f8575cca9c21e9565804fe5282c789 /admin | |
| parent | 372124e44a89a02a916f35687773298b7d96e72e (diff) | |
| parent | 880e2253cc0f28a249b6f8f42ef2950cb391db6b (diff) | |
| download | themes-52d27352cc239299b35d18beffb5bfd38988b31e.tar.gz themes-52d27352cc239299b35d18beffb5bfd38988b31e.tar.bz2 themes-52d27352cc239299b35d18beffb5bfd38988b31e.zip | |
resolve conflict - deleteed edit_css.php
Diffstat (limited to 'admin')
| -rw-r--r-- | admin/admin_custom_modules_inc.php | 2 | ||||
| -rw-r--r-- | admin/admin_layout_inc.php | 2 | ||||
| -rw-r--r-- | admin/admin_modules_inc.php | 2 | ||||
| -rw-r--r-- | admin/admin_themes_manager.php | 2 | ||||
| -rw-r--r-- | admin/menus.php | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/admin/admin_custom_modules_inc.php b/admin/admin_custom_modules_inc.php index 6cb06b7..4b3dd93 100644 --- a/admin/admin_custom_modules_inc.php +++ b/admin/admin_custom_modules_inc.php @@ -1,7 +1,7 @@ <?php // $Header$ -require_once( '../../kernel/setup_inc.php' ); +require_once( '../../kernel/includes/setup_inc.php' ); $feedback = array(); if( !empty( $_REQUEST['name'] )) { diff --git a/admin/admin_layout_inc.php b/admin/admin_layout_inc.php index 48f4951..4be0eeb 100644 --- a/admin/admin_layout_inc.php +++ b/admin/admin_layout_inc.php @@ -2,7 +2,7 @@ // $Header$ // Initialization -require_once( '../../kernel/setup_inc.php' ); +require_once( '../../kernel/includes/setup_inc.php' ); if( defined( 'ROLE_MODEL' )) { if( !isset($_REQUEST["roles"] ) ) { diff --git a/admin/admin_modules_inc.php b/admin/admin_modules_inc.php index 9742757..aaeff7e 100644 --- a/admin/admin_modules_inc.php +++ b/admin/admin_modules_inc.php @@ -1,7 +1,7 @@ <?php // $Header$ -require_once( '../../kernel/setup_inc.php' ); +require_once( '../../kernel/includes/setup_inc.php' ); $formModuleFeatures = array( // 'site_collapsible_modules' => array( diff --git a/admin/admin_themes_manager.php b/admin/admin_themes_manager.php index bb29750..4c27db6 100644 --- a/admin/admin_themes_manager.php +++ b/admin/admin_themes_manager.php @@ -1,5 +1,5 @@ <?php -require_once( '../../kernel/setup_inc.php' ); +require_once( '../../kernel/includes/setup_inc.php' ); require_once( KERNEL_PKG_PATH.'simple_form_functions_lib.php' ); $gBitSystem->verifyPermission( 'p_admin' ); diff --git a/admin/menus.php b/admin/menus.php index fba8182..8140902 100644 --- a/admin/menus.php +++ b/admin/menus.php @@ -2,7 +2,7 @@ // // (c) 2006 bitweaver.org - GNU LGPL // -require_once( '../../kernel/setup_inc.php' ); +require_once( '../../kernel/includes/setup_inc.php' ); require_once( KERNEL_PKG_PATH."simple_form_functions_lib.php" ); //$gBitSmarty->assign( 'loadDragDrop', TRUE ); |