From 9712518f2b7bfad591285979513848c72ed7e48f Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Mon, 9 Jun 2014 15:05:33 +0200 Subject: [PATCH 1/2] [ticket/239] Disable uploading portal modules for now B3P-239 --- acp/portal_info.php | 2 +- migrations/v210_beta1.php | 10 ---------- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/acp/portal_info.php b/acp/portal_info.php index 39df7038..6f557bb1 100644 --- a/acp/portal_info.php +++ b/acp/portal_info.php @@ -28,7 +28,7 @@ class portal_info 'modes' => array( 'config' => array('title' => 'ACP_PORTAL_GENERAL_INFO', 'auth' => 'acl_a_manage_portal', 'cat' => array('ACP_PORTAL')), 'modules' => array('title' => 'ACP_PORTAL_MODULES', 'auth' => 'acl_a_manage_portal', 'cat' => array('ACP_PORTAL')), - 'upload_module' => array('title' => 'ACP_PORTAL_UPLOAD', 'auth' => 'acl_a_manage_portal', 'cat' => array('ACP_PORTAL')), + //'upload_module' => array('title' => 'ACP_PORTAL_UPLOAD', 'auth' => 'acl_a_manage_portal', 'cat' => array('ACP_PORTAL')), ), ); } diff --git a/migrations/v210_beta1.php b/migrations/v210_beta1.php index 93d58a4c..23713860 100644 --- a/migrations/v210_beta1.php +++ b/migrations/v210_beta1.php @@ -170,16 +170,6 @@ class v210_beta1 extends \phpbb\db\migration\migration 'module_langname' => 'ACP_PORTAL_MODULES', ), )), - array('module.add', array( - 'acp', - 'ACP_PORTAL', - array( - 'module_basename' => '\board3\portal\acp\portal_module', - 'module_mode' => 'upload_module', - 'module_auth' => 'acl_a_manage_portal', - 'module_langname' => 'ACP_PORTAL_UPLOAD', - ), - )), array('custom', array(array($this, 'add_portal_data'))), ); From 923574566bc6f710a80e354f906e2c3c8909e02b Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Mon, 9 Jun 2014 15:11:12 +0200 Subject: [PATCH 2/2] [ticket/239] Do not test access to the upload module B3P-239 --- acp/portal_info.php | 2 +- tests/functional/portal_acp_test.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/acp/portal_info.php b/acp/portal_info.php index 6f557bb1..b8cc7eeb 100644 --- a/acp/portal_info.php +++ b/acp/portal_info.php @@ -28,7 +28,7 @@ class portal_info 'modes' => array( 'config' => array('title' => 'ACP_PORTAL_GENERAL_INFO', 'auth' => 'acl_a_manage_portal', 'cat' => array('ACP_PORTAL')), 'modules' => array('title' => 'ACP_PORTAL_MODULES', 'auth' => 'acl_a_manage_portal', 'cat' => array('ACP_PORTAL')), - //'upload_module' => array('title' => 'ACP_PORTAL_UPLOAD', 'auth' => 'acl_a_manage_portal', 'cat' => array('ACP_PORTAL')), + // 'upload_module' => array('title' => 'ACP_PORTAL_UPLOAD', 'auth' => 'acl_a_manage_portal', 'cat' => array('ACP_PORTAL')), ), ); } diff --git a/tests/functional/portal_acp_test.php b/tests/functional/portal_acp_test.php index 828b9ad0..f3e68829 100644 --- a/tests/functional/portal_acp_test.php +++ b/tests/functional/portal_acp_test.php @@ -25,7 +25,7 @@ class phpbb_functional_portal_acp_test extends \board3\portal\tests\testframewor return array( array('config'), array('modules'), - array('upload_module'), + // array('upload_module'), ); }