Merge pull request #5 from milkyway-multimedia/3.1-compatiblity

3.1 compatiblity
adrexia · Jul 12, 2014 · 6b6e666 · 6b6e666
2 parents 5151160 + 74855ab
commit 6b6e666
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/code/CMSBatchAction_MoveToController.php b/code/CMSBatchAction_MoveToController.php
@@ -7,11 +7,11 @@
  */
 class CMSBatchAction_MoveToController extends LeftAndMain {
 
-	static $url_segment = 'batchmoveto';
+	private static $url_segment = 'batchmoveto';
 
-	static $menu_title = 'Move to';
+	private static $menu_title = 'Move to';
 
-	static $required_permission_codes = false;
+	private static $required_permission_codes = false;
 
 	private static $allowed_actions = array (
 		'MovePagesForm',

diff --git a/composer.json b/composer.json
@@ -12,7 +12,7 @@
         ],
         "require":
         {
-                "silverstripe/framework": "~3.0",
-                "silverstripe/cms": "~3.0"
+                "silverstripe/framework": "~3.1",
+                "silverstripe/cms": "~3.1"
         }
 }