Merge branch '6' into 7.0

# Conflicts:
#	code/Model/UserDefinedForm.php

code/Model/EditableCustomRule.php

@@ -119,7 +119,7 @@ protected function getCanCreateContext($args)
         }
         // Hack in currently edited page if context is missing
         if (Controller::has_curr() && Controller::curr() instanceof CMSMain) {
-            return Controller::curr()->currentPage();
+            return Controller::curr()->currentRecord();
         }
 
         // No page being edited

code/Model/EditableFormField.php

@@ -509,7 +509,7 @@ public function canEdit($member = null)
             // This is to restore User Forms 2.x backwards compatibility.
             $controller = Controller::curr();
             if ($controller && $controller instanceof CMSPageEditController) {
-                $parent = $controller->getRecord($controller->currentPageID());
+                $parent = $controller->getRecord($controller->currentRecordID());
                 // Only allow this behaviour on pages using UserFormFieldEditorExtension, such
                 // as UserDefinedForm page type.
                 if ($parent && $parent->hasExtension(UserFormFieldEditorExtension::class)) {
@@ -572,7 +572,7 @@ protected function getCanCreateContext($args)
         }
         // Hack in currently edited page if context is missing
         if (Controller::has_curr() && Controller::curr() instanceof CMSMain) {
-            return Controller::curr()->currentPage();
+            return Controller::curr()->currentRecord();
         }
 
         // No page being edited

code/Model/Recipient/EmailRecipient.php

@@ -466,7 +466,7 @@ protected function getCanCreateContext($args)
         }
         // Hack in currently edited page if context is missing
         if (Controller::has_curr() && Controller::curr() instanceof CMSMain) {
-            return Controller::curr()->currentPage();
+            return Controller::curr()->currentRecord();
         }
 
         // No page being edited

code/Model/Recipient/EmailRecipientCondition.php

@@ -143,7 +143,7 @@ protected function getCanCreateContext($args)
         }
         // Hack in currently edited page if context is missing
         if (Controller::has_curr() && Controller::curr() instanceof CMSMain) {
-            return Controller::curr()->currentPage();
+            return Controller::curr()->currentRecord();
         }
 
         // No page being edited

code/Model/UserDefinedForm.php

@@ -18,6 +18,7 @@ class UserDefinedForm extends Page
 
     /**
      * @var string
+     * @deprecated 6.4.0 Will be renamed to cms_icon_class
      */
     private static $icon_class = 'font-icon-p-list';
 

tests/php/Form/GridFieldAddClassesButtonTest.php

@@ -31,7 +31,7 @@ public function testHandleAddUpdatesModifiedFormData()
         $request = new HTTPRequest('GET', '/');
         $request->setSession(new Session([]));
         $controller->setRequest($request);
-        $controller->setCurrentPageID($udf->ID);
+        $controller->setCurrentRecordID($udf->ID);
         $controller->pushCurrent();
         $list = new DataList(EditableFormField::class);
         $field = EditableTextField::create([