Ticket #5547: 2.4.1-FileUpload-2.diff

cms/code/AssetAdmin.php

@@ -220 +220 @@
                         }
                 
                         if($tmpFile['tmp_name']) {
-                                // Workaround open_basedir problems
-                                if(ini_get("open_basedir")) {
-                                        $newtmp = TEMP_FOLDER . '/' . $tmpFile['name'];
-                                        move_uploaded_file($tmpFile['tmp_name'], $newtmp);
-                                        $tmpFile['tmp_name'] = $newtmp;
-                                }
-                                
                                 // validate files (only if not logged in as admin)
                                 if(!File::$apply_restrictions_to_admin && Permission::check('ADMIN')) {
                                         $valid = true;

sapphire/filesystem/Folder.php

@@ -247 +247 @@
                 
                 if (move_uploaded_file($tmpFile['tmp_name'], "$base/$file$ext")) {
                         // Update with the new image
+                        chmod("$base/$file$ext", Filesystem::$file_create_mask);
                         return $this->constructChild(basename($file . $ext));
                 } else {
                         if(!file_exists($tmpFile['tmp_name'])) user_error("Folder::addUploadToFolder: '$tmpFile[tmp_name]' doesn't exist", E_USER_ERROR);