(merged from branches/roa. use "svn log -c <changeset> -g <module-svn…

…-path>" for detailed commit message)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@60207 467b73ca-7a2a-4603-9d3b-597d59a354a9

_config.php

@@ -5,19 +5,20 @@
  * @package cms
  */
 Director::addRules(50, array(
-	'processes/$Action/$ID/$Batch' => 'BatchProcess_Controller',
+	'processes//$Action/$ID/$Batch' => 'BatchProcess_Controller',
 	'silverstripe' => '->admin',
 	'cms' => '->admin',
-	'admin/security/$Action/$ID/$OtherID' => 'SecurityAdmin',
-	'admin/help/$Action/$ID' => 'CMSHelp',
-	'admin/reports/$Action/$ID' => 'ReportAdmin',
-	'admin/assets/$Action/$ID' => 'AssetAdmin',
-	'admin/comments/$Action' => 'CommentAdmin',
-	'admin/ReportField/$Action/$ID/$Type/$OtherID' => 'ReportField_Controller',
-	'admin/ImageEditor/$Action' => 'ImageEditor',
-	'admin/$Action/$ID/$OtherID' => 'CMSMain',
-	'unsubscribe/$Email/$MailingList' => 'Unsubscribe_Controller',
-	'PageComment/$Action/$ID' => 'PageComment_Controller'
+	'admin/security//$Action/$ID/$OtherID' => 'SecurityAdmin',
+	'admin/help//$Action/$ID' => 'CMSHelp',
+	'admin/reports//$Action/$ID' => 'ReportAdmin',
+	'admin/assets//$Action/$ID' => 'AssetAdmin',
+	'admin/comments//$Action' => 'CommentAdmin',
+	'admin/ReportField//$Action/$ID/$Type/$OtherID' => 'ReportField_Controller',
+	'admin/bulkload//$Action/$ID/$OtherID' => 'BulkLoaderAdmin',
+	'admin//ImageEditor/$Action' => 'ImageEditor',
+	'admin//$Action/$ID/$OtherID' => 'CMSMain',
+	'unsubscribe//$Email/$MailingList' => 'Unsubscribe_Controller'
+	'PageComment//$Action/$ID' => 'PageComment_Controller'
 ));
 
 // Built-in modules

code/CMSMain.php

@@ -43,6 +43,8 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr
 		'unpublish',
 		'versions',
 		'waitingon',
+		'EditForm',
+		'AddPageOptionsForm',
 	);
 
 	/**

code/LeftAndMain.php

@@ -35,6 +35,7 @@ class LeftAndMain extends Controller {
 		'printable',
 		'save',
 		'show',
+		'Member_ProfileForm'
 	);
 
 	/**