From cbe0ac8507f94ea3e35680a97f44b58a296e168e Mon Sep 17 00:00:00 2001
From: Damian Mooyman <damian@silverstripe.com>
Date: Fri, 23 Sep 2016 16:13:09 +1200
Subject: [PATCH] BUG Fix invalid import form requirements (#6071)

---
 Security/CMSSecurity.php        | 2 +-
 admin/code/MemberImportForm.php | 2 +-
 admin/code/SecurityAdmin.php    | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Security/CMSSecurity.php b/Security/CMSSecurity.php
index 8aabbfd28..303936338 100644
--- a/Security/CMSSecurity.php
+++ b/Security/CMSSecurity.php
@@ -36,7 +36,7 @@ class CMSSecurity extends Security {
 	protected function init() {
 		parent::init();
 
-		Requirements::javascript(FRAMEWORK_ADMIN_DIR . '/client/dist/js/bundle-lib.js');
+		Requirements::javascript(FRAMEWORK_ADMIN_DIR . '/client/dist/js/vendor.js');
 		Requirements::javascript(FRAMEWORK_ADMIN_DIR . '/client/dist/js/CMSSecurity.js');
 	}
 
diff --git a/admin/code/MemberImportForm.php b/admin/code/MemberImportForm.php
index 3b844a956..785005fd7 100644
--- a/admin/code/MemberImportForm.php
+++ b/admin/code/MemberImportForm.php
@@ -71,7 +71,7 @@ class MemberImportForm extends Form {
 
 		parent::__construct($controller, $name, $fields, $actions, $validator);
 
-		Requirements::javascript(ltrim(FRAMEWORK_ADMIN_DIR . '/client/dist/js/bundle-lib.js', '/'));
+		Requirements::javascript(FRAMEWORK_ADMIN_DIR . '/client/dist/js/vendor.js');
 		Requirements::javascript(FRAMEWORK_ADMIN_DIR . '/client/dist/js/MemberImportForm.js');
 		Requirements::css(FRAMEWORK_ADMIN_DIR . '/client/dist/styles/bundle.css');
 
diff --git a/admin/code/SecurityAdmin.php b/admin/code/SecurityAdmin.php
index 82351fb48..31b29267b 100755
--- a/admin/code/SecurityAdmin.php
+++ b/admin/code/SecurityAdmin.php
@@ -165,7 +165,7 @@ class SecurityAdmin extends LeftAndMain implements PermissionProvider {
 				new LiteralField(
 					'MemberImportFormIframe',
 					sprintf(
-							'<iframe src="%s" id="MemberImportFormIframe" width="100%%" height="250px" frameBorder="0">'
+							'<iframe src="%s" id="MemberImportFormIframe" width="100%%" height="330px" frameBorder="0">'
 						. '</iframe>',
 						$this->Link('memberimport')
 					)
@@ -176,7 +176,7 @@ class SecurityAdmin extends LeftAndMain implements PermissionProvider {
 				new LiteralField(
 					'GroupImportFormIframe',
 					sprintf(
-							'<iframe src="%s" id="GroupImportFormIframe" width="100%%" height="250px" frameBorder="0">'
+							'<iframe src="%s" id="GroupImportFormIframe" width="100%%" height="330px" frameBorder="0">'
 						. '</iframe>',
 						$this->Link('groupimport')
 					)
@@ -233,7 +233,7 @@ class SecurityAdmin extends LeftAndMain implements PermissionProvider {
 
 	public function memberimport() {
 		Requirements::clear();
-		Requirements::javascript(ltrim(FRAMEWORK_ADMIN_DIR . '/client/dist/js/bundle-lib.js', '/'));
+		Requirements::javascript(FRAMEWORK_ADMIN_DIR . '/client/dist/js/vendor.js');
 		Requirements::javascript(ltrim(FRAMEWORK_ADMIN_DIR . '/client/dist/js/MemberImportForm.js', '/'));
 		Requirements::css(ltrim(FRAMEWORK_ADMIN_DIR . '/client/dist/styles/bundle.css', '/'));
 
@@ -267,7 +267,7 @@ class SecurityAdmin extends LeftAndMain implements PermissionProvider {
 
 	public function groupimport() {
 		Requirements::clear();
-		Requirements::javascript(ltrim(FRAMEWORK_ADMIN_DIR . '/client/dist/js/bundle-lib.js', '/'));
+		Requirements::javascript(FRAMEWORK_ADMIN_DIR . '/client/dist/js/vendor.js');
 		Requirements::javascript(ltrim(FRAMEWORK_ADMIN_DIR . '/client/dist/js/MemberImportForm.js', '/'));
 		Requirements::css(ltrim(FRAMEWORK_ADMIN_DIR . '/client/dist/styles/bundle.css', '/'));