? moving.file-system.patch ? sites/default/files ? sites/default/settings.php Index: modules/color/color.module =================================================================== RCS file: /cvs/drupal/drupal/modules/color/color.module,v retrieving revision 1.64 diff -u -p -r1.64 color.module --- modules/color/color.module 5 Aug 2009 19:40:55 -0000 1.64 +++ modules/color/color.module 15 Aug 2009 23:00:46 -0000 @@ -7,7 +7,7 @@ function color_help($path, $arg) { switch ($path) { case 'admin/help#color': - $output = '

' . t('The color module allows a site administrator to quickly and easily change the color scheme of certain themes. Although not all themes support color module, both Garland (the default theme) and Minnelli were designed to take advantage of its features. By using color module with a compatible theme, you can easily change the color of links, backgrounds, text, and other theme elements. Color module requires that your file download method be set to public.', array('@url' => url('admin/settings/file-system'))) . '

'; + $output = '

' . t('The color module allows a site administrator to quickly and easily change the color scheme of certain themes. Although not all themes support color module, both Garland (the default theme) and Minnelli were designed to take advantage of its features. By using color module with a compatible theme, you can easily change the color of links, backgrounds, text, and other theme elements. Color module requires that your file download method be set to public.', array('@url' => url('admin/config/media/file-system'))) . '

'; $output .= '

' . t("It is important to remember that color module saves a modified copy of the theme's specified stylesheets in the files directory. This means that if you make any manual changes to your theme's stylesheet, you must save your color settings again, even if they haven't changed. This causes the color module generated version of the stylesheets in the files directory to be recreated using the new version of the original file.") . '

'; $output .= '

' . t('To change the color settings for a compatible theme, select the "configure" link for the theme on the themes administration page.', array('@themes' => url('admin/appearance'))) . '

'; $output .= '

' . t('For more information, see the online handbook entry for Color module.', array('@color' => 'http://drupal.org/handbook/modules/color/')) . '

'; @@ -35,7 +35,7 @@ function color_form_system_theme_setting if (variable_get('file_downloads', FILE_DOWNLOADS_PUBLIC) != FILE_DOWNLOADS_PUBLIC) { // Disables the color changer when the private download method is used. // TODO: This should be solved in a different way. See issue #181003. - drupal_set_message(t('The color picker only works if the download method is set to public.', array('@url' => url('admin/settings/file-system'))), 'warning'); + drupal_set_message(t('The color picker only works if the download method is set to public.', array('@url' => url('admin/config/media/file-system'))), 'warning'); } else { $form['color'] = array( Index: modules/system/system.admin.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/system/system.admin.inc,v retrieving revision 1.176 diff -u -p -r1.176 system.admin.inc --- modules/system/system.admin.inc 15 Aug 2009 06:27:49 -0000 1.176 +++ modules/system/system.admin.inc 15 Aug 2009 22:59:38 -0000 @@ -1401,13 +1401,13 @@ function system_performance_settings() { $disabled = !$is_writable && !$public_downloads; $disabled_message = ''; if(!$is_writable && !$public_downloads) { - $disabled_message = ' ' . t('Please set up the files directory and set the download method to public to make these optimizations available.', array('!file-system' => url('admin/settings/file-system'))); + $disabled_message = ' ' . t('Please set up the files directory and set the download method to public to make these optimizations available.', array('!file-system' => url('admin/config/media/file-system'))); } elseif(!$is_writable) { - $disabled_message = ' ' . t('Please set up the files directory to make these optimizations available.', array('!file-system' => url('admin/settings/file-system'))); + $disabled_message = ' ' . t('Please set up the files directory to make these optimizations available.', array('!file-system' => url('admin/config/media/file-system'))); } elseif(!$public_downloads) { - $disabled_message = ' ' . t('Please set the download method to public to make these optimizations available.', array('!file-system' => url('admin/settings/file-system'))); + $disabled_message = ' ' . t('Please set the download method to public to make these optimizations available.', array('!file-system' => url('admin/config/media/file-system'))); } $form['bandwidth_optimization'] = array( '#type' => 'fieldset', Index: modules/system/system.install =================================================================== RCS file: /cvs/drupal/drupal/modules/system/system.install,v retrieving revision 1.367 diff -u -p -r1.367 system.install --- modules/system/system.install 12 Aug 2009 23:51:19 -0000 1.367 +++ modules/system/system.install 15 Aug 2009 22:57:01 -0000 @@ -200,7 +200,7 @@ function system_requirements($phase) { } // The files directory requirement check is done only during install and runtime. if ($phase == 'runtime') { - $description = $error . ' ' . $t('You may need to set the correct directory at the file system settings page or change the current directory\'s permissions so that it is writable.', array('@admin-file-system' => url('admin/settings/file-system'))); + $description = $error . ' ' . $t('You may need to set the correct directory at the file system settings page or change the current directory\'s permissions so that it is writable.', array('@admin-file-system' => url('admin/config/media/file-system'))); } elseif ($phase == 'install') { // For the installer UI, we need different wording. 'value' will Index: modules/system/system.module =================================================================== RCS file: /cvs/drupal/drupal/modules/system/system.module,v retrieving revision 1.748 diff -u -p -r1.748 system.module --- modules/system/system.module 15 Aug 2009 15:57:44 -0000 1.748 +++ modules/system/system.module 15 Aug 2009 22:55:49 -0000 @@ -96,7 +96,7 @@ function system_help($path, $arg) { $output .= '
  • ' . t('support for enabling and disabling themes, which determine the design and presentation of your site. Drupal comes packaged with several core themes and additional contributed themes are available at the Drupal.org theme page.', array('@themes' => url('admin/appearance'), '@drupal-themes' => 'http://drupal.org/project/themes')) . '
    • '; $output .= '
  • ' . t('a robust caching system that allows the efficient re-use of previously-constructed web pages and web page components. Drupal stores the pages requested by anonymous users in a compressed format; depending on your site configuration and the amount of your web traffic tied to anonymous visitors, Drupal\'s caching system may significantly increase the speed of your site.', array('@cache-settings' => url('admin/config/development/performance'))) . '
    • '; $output .= '
  • ' . t('a set of routine administrative operations that rely on a correctly-configured cron maintenance task to run automatically. A number of other modules, including the feed aggregator, and search also rely on cron maintenance tasks. For more information, see the online handbook entry for configuring cron jobs.', array('@cron' => url('admin/reports/status'), '@handbook' => 'http://drupal.org/cron')) . '
    • '; - $output .= '
  • ' . t('basic configuration options for your site, including date and time settings, file system settings, clean URL support, site name and other information, and a maintenance mode for taking your site temporarily offline.', array('@regional-settings' => url('admin/settings/regional-settings'), '@file-system' => url('admin/settings/file-system'), '@clean-url' => url('admin/settings/clean-urls'), '@site-info' => url('admin/settings/site-information'), '@maintenance-mode' => url('admin/config/development/maintenance'))) . '
    • '; + $output .= '
  • ' . t('basic configuration options for your site, including date and time settings, file system settings, clean URL support, site name and other information, and a maintenance mode for taking your site temporarily offline.', array('@regional-settings' => url('admin/settings/regional-settings'), '@file-system' => url('admin/config/media/file-system'), '@clean-url' => url('admin/settings/clean-urls'), '@site-info' => url('admin/settings/site-information'), '@maintenance-mode' => url('admin/config/development/maintenance'))) . '
    • '; $output .= '

    ' . t('For more information, see the online handbook entry for System module.', array('@system' => 'http://drupal.org/handbook/modules/system/')) . '

    '; return $output; case 'admin/by-module': @@ -711,7 +711,7 @@ function system_menu() { 'page arguments' => array('system_logging_settings'), 'access arguments' => array('administer site configuration'), ); - $items['admin/settings/file-system'] = array( + $items['admin/config/media/file-system'] = array( 'title' => 'File system', 'description' => 'Tell Drupal where to store uploaded files and how they are accessed.', 'page callback' => 'drupal_get_form', Index: modules/upload/upload.module =================================================================== RCS file: /cvs/drupal/drupal/modules/upload/upload.module,v retrieving revision 1.245 diff -u -p -r1.245 upload.module --- modules/upload/upload.module 31 Jul 2009 19:01:02 -0000 1.245 +++ modules/upload/upload.module 15 Aug 2009 23:02:09 -0000 @@ -250,7 +250,7 @@ function upload_form_alter(&$form, $form if (!file_check_directory($path, FILE_CREATE_DIRECTORY) || !file_check_directory($temp, FILE_CREATE_DIRECTORY)) { $form['attachments']['#description'] = t('File attachments are disabled. The file directories have not been properly configured.'); if (user_access('administer site configuration')) { - $form['attachments']['#description'] .= ' ' . t('Please visit the file system configuration page.', array('@admin-file-system' => url('admin/settings/file-system'))); + $form['attachments']['#description'] .= ' ' . t('Please visit the file system configuration page.', array('@admin-file-system' => url('admin/config/media/file-system'))); } else { $form['attachments']['#description'] .= ' ' . t('Please contact the site administrator.');