#556594 by sign: Move File Uploads under Media.

modules/upload/upload.module

@@ -17,7 +17,7 @@ function upload_help($path, $arg) {
       $output .= '<p>' . t('Users with the upload files permission can upload attachments to posts. Uploads may be enabled for specific content types on the content types settings page. Each user role can be customized to limit or control the file size of uploads, or the maximum dimension of image files.') . '</p>';
       $output .= '<p>' . t('For more information, see the online handbook entry for <a href="@upload">Upload module</a>.', array('@upload' => 'http://drupal.org/handbook/modules/upload/')) . '</p>';
       return $output;
-    case 'admin/settings/upload':
+    case 'admin/config/media/uploads':
       return '<p>' . t('Users with the <a href="@permissions">upload files permission</a> can upload attachments. Users with the <a href="@permissions">view uploaded files permission</a> can view uploaded attachments. You can choose which post types can take attachments on the <a href="@types">content types settings</a> page.', array('@permissions' => url('admin/config/people/permissions'), '@types' => url('admin/settings/types'))) . '</p>';
   }
 }
@@ -92,7 +92,7 @@ function upload_menu() {
     'access arguments' => array('upload files'),
     'type' => MENU_CALLBACK,
   );
-  $items['admin/settings/uploads'] = array(
+  $items['admin/config/media/uploads'] = array(
     'title' => 'File uploads',
     'description' => 'Control how files may be attached to content.',
     'page callback' => 'drupal_get_form',

modules/upload/upload.test

@@ -36,7 +36,7 @@ class UploadTestCase extends DrupalWebTestCase {
     $edit['upload_extensions_default'] = 'jpg jpeg gif png txt doc xls pdf ppt pps odt ods odp';
     $edit['upload_uploadsize_default'] = '1.5';
     $edit['upload_usersize_default'] = '1.5';
-    $this->drupalPost('admin/settings/uploads', $edit, t('Save configuration'));
+    $this->drupalPost('admin/config/media/uploads', $edit, t('Save configuration'));
     $this->assertText('The configuration options have been saved.', 'Upload setting saved.');
 
     $this->drupalLogout();
@@ -181,7 +181,7 @@ class UploadTestCase extends DrupalWebTestCase {
         $edit[$key . '_' . $rid] = $value;
       }
     }
-    $this->drupalPost('admin/settings/uploads', $edit, 'Save configuration');
+    $this->drupalPost('admin/config/media/uploads', $edit, 'Save configuration');
     $this->assertText('The configuration options have been saved.', 'Upload setting saved.');
   }