MINOR Fixed merge errors

core/model/SiteTree.php

@@ -1672,11 +1672,6 @@ function VirtualPages() {
 	 */
 	function getCMSFields() {
 		require_once("forms/Form.php");
-		Requirements::javascript(SAPPHIRE_DIR . "/thirdparty/prototype/prototype.js");
-		Requirements::javascript(SAPPHIRE_DIR . "/thirdparty/behaviour/behaviour.js");
-		Requirements::javascript(CMS_DIR . "/javascript/SitetreeAccess.js");
-		Requirements::add_i18n_javascript(SAPPHIRE_DIR . '/javascript/lang');
-		Requirements::javascript(SAPPHIRE_DIR . '/javascript/UpdateURL.js');
 
 		// Status / message
 		// Create a status message for multiple parents

docs/en/reference/leftandmain.md

@@ -6,12 +6,6 @@ LeftAndMain is the base class of all the admin area controllers.
 
 ## Best Practices
 
-### Refreshing
-
-Please use LeftAndMain::ForceReload to reload the whole form-area after an Ajax-Request. If you just need to refresh
-parts of the form, please use javascript-replacement in the response of the original Ajax-Request. Consider using
-`[api:Form]` for  compiling Ajax-Responses and automatic detection of Ajax/Non-Ajax-Calls.
-
 ### Custom Access Checking
 
 You can customize access control in `[api:LeftAndMain]`.

filesystem/Folder.php

@@ -25,6 +25,12 @@ class Folder extends File {
 
 	static $default_sort = "\"Sort\"";
 
+	function populateDefaults() {
+		parent::populateDefaults();
+
+		if(!$this->Name) $this->Name = _t('AssetAdmin.NEWFOLDER',"NewFolder");
+	}
+
 	/**
 	 * Find the given folder or create it both as {@link Folder} database records
 	 * and on the filesystem. If necessary, creates parent folders as well.