? moving.all.media.patch ? moving.file-system.patch ? moving.more.media.patch ? sites/default/files ? sites/default/settings.php Index: includes/image.inc =================================================================== RCS file: /cvs/drupal/drupal/includes/image.inc,v retrieving revision 1.33 diff -u -p -r1.33 image.inc --- includes/image.inc 20 Apr 2009 20:02:30 -0000 1.33 +++ includes/image.inc 16 Aug 2009 21:26:47 -0000 @@ -24,7 +24,7 @@ * Image toolkits are discovered based on the associated module's * hook_image_toolkits. Additionally the image toolkit include file * must be identified in the files array in the module.info file. The - * toolkit must then be enabled using the admin/settings/image-toolkit + * toolkit must then be enabled using the admin/config/media/image-toolkit * form. * * Only one toolkit may be selected at a time. If a module author wishes to call 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/image/image.admin.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/image/image.admin.inc,v retrieving revision 1.2 diff -u -p -r1.2 image.admin.inc --- modules/image/image.admin.inc 13 Aug 2009 02:03:29 -0000 1.2 +++ modules/image/image.admin.inc 16 Aug 2009 21:16:25 -0000 @@ -75,10 +75,10 @@ function image_style_form(&$form_state, '#default_value' => $effect['weight'], ); $form['effects'][$ieid]['configure'] = array( - '#markup' => isset($effect['form callback']) ? l(t('configure'), 'admin/settings/image-styles/edit/' . $style['name'] . '/effects/' . $effect['ieid'] ) : '', + '#markup' => isset($effect['form callback']) ? l(t('configure'), 'admin/config/media/image-styles/edit/' . $style['name'] . '/effects/' . $effect['ieid'] ) : '', ); $form['effects'][$ieid]['remove'] = array( - '#markup' => l(t('delete'), 'admin/settings/image-styles/edit/' . $style['name'] . '/effects/' . $effect['ieid'] . '/delete'), + '#markup' => l(t('delete'), 'admin/config/media/image-styles/edit/' . $style['name'] . '/effects/' . $effect['ieid'] . '/delete'), ); } @@ -140,7 +140,7 @@ function image_style_form_add_submit($fo // Load the configuration form for this option. if (isset($effect['form callback'])) { - $path = 'admin/settings/image-styles/edit/' . $form_state['image_style']['name'] . '/add/' . $form_state['values']['new']; + $path = 'admin/config/media/image-styles/edit/' . $form_state['image_style']['name'] . '/add/' . $form_state['values']['new']; $form_state['redirect'] = array($path, array('weight' => $form_state['values']['weight'])); } // If there's no form, immediately add the image effect. @@ -177,7 +177,7 @@ function image_style_form_submit($form, if ($form_state['values']['op'] == t('Update style')) { drupal_set_message('Changes to the style have been saved.'); } - $form_state['redirect'] = 'admin/settings/image-styles/edit/' . $style['name']; + $form_state['redirect'] = 'admin/config/media/image-styles/edit/' . $style['name']; } /** @@ -215,7 +215,7 @@ function image_style_add_form_submit($fo $style = array('name' => $form_state['values']['name']); $style = image_style_save($style); drupal_set_message(t('Style %name was created.', array('%name' => $style['name']))); - $form_state['redirect'] = 'admin/settings/image-styles/edit/' . $style['name']; + $form_state['redirect'] = 'admin/config/media/image-styles/edit/' . $style['name']; } /** @@ -258,7 +258,7 @@ function image_style_delete_form($form_s return confirm_form( $form, t('Optionally select a style before deleting %style', array('%style' => $style['name'])), - 'admin/settings/image-styles', + 'admin/config/media/image-styles', t('If this style is in use on the site, you may select another style to replace it. All images that have been generated for this style will be permanently deleted.'), t('Delete'), t('Cancel') ); @@ -272,7 +272,7 @@ function image_style_delete_form_submit( image_style_delete($style, $form_state['values']['replacement']); drupal_set_message(t('Style %name was deleted.', array('%name' => $style['name']))); - $form_state['redirect'] = 'admin/settings/image-styles'; + $form_state['redirect'] = 'admin/config/media/image-styles'; } /** @@ -314,7 +314,7 @@ function image_effect_form(&$form_state, // If no configuration for this image effect, return to the image style page. if (!isset($effect['form callback'])) { - drupal_goto('admin/settings/image-styles/edit/' . $style['name']); + drupal_goto('admin/config/media/image-styles/edit/' . $style['name']); } $form = array( @@ -337,7 +337,7 @@ function image_effect_form(&$form_state, '#value' => isset($effect['ieid']) ? t('Update effect') : t('Add effect'), ); $form['buttons']['cancel'] = array( - '#markup' => l(t('Cancel'), 'admin/settings/image-styles/edit/' . $style['name']), + '#markup' => l(t('Cancel'), 'admin/config/media/image-styles/edit/' . $style['name']), ); return $form; @@ -352,7 +352,7 @@ function image_effect_form_submit($form, $effect['isid'] = $style['isid']; image_effect_save($effect); drupal_set_message(t('The image effect was successfully applied.')); - $form_state['redirect'] = 'admin/settings/image-styles/edit/' . $style['name']; + $form_state['redirect'] = 'admin/config/media/image-styles/edit/' . $style['name']; } /** @@ -371,7 +371,7 @@ function image_effect_delete_form(&$form $form = array(); $question = t('Are you sure you want to delete the @effect effect from the %style style?', array('%style' => $style['name'], '@effect' => $effect['label'])); - return confirm_form($form, $question, 'admin/settings/image-styles/edit/' . $style['name'], '', t('Delete')); + return confirm_form($form, $question, 'admin/config/media/image-styles/edit/' . $style['name'], '', t('Delete')); } /** @@ -383,7 +383,7 @@ function image_effect_delete_form_submit image_effect_delete($effect); drupal_set_message(t('The image effect %name has been deleted.', array('%name' => $effect['label']))); - $form_state['redirect'] = 'admin/settings/image-styles/edit/' . $style['name']; + $form_state['redirect'] = 'admin/config/media/image-styles/edit/' . $style['name']; } /** @@ -577,21 +577,21 @@ function theme_image_style_list($styles) $rows = array(); foreach ($styles as $style) { $row = array(); - $row[] = l($style['name'], 'admin/settings/image-styles/edit/' . $style['name']); + $row[] = l($style['name'], 'admin/config/media/image-styles/edit/' . $style['name']); $link_attributes = array( 'attributes' => array( 'class' => 'image-style-link', ), ); - $row[] = l(t('edit'), 'admin/settings/image-styles/edit/' . $style['name'], $link_attributes); - $row[] = l(t('delete'), 'admin/settings/image-styles/delete/' . $style['name'], $link_attributes); + $row[] = l(t('edit'), 'admin/config/media/image-styles/edit/' . $style['name'], $link_attributes); + $row[] = l(t('delete'), 'admin/config/media/image-styles/delete/' . $style['name'], $link_attributes); $rows[] = $row; } if (empty($rows)) { $rows[] = array(array( 'colspan' => 4, - 'data' => t('There are currently no styles. Add a new one.', array('!url' => url('admin/settings/image-styles/add'))), + 'data' => t('There are currently no styles. Add a new one.', array('!url' => url('admin/config/media/image-styles/add'))), )); } Index: modules/image/image.module =================================================================== RCS file: /cvs/drupal/drupal/modules/image/image.module,v retrieving revision 1.6 diff -u -p -r1.6 image.module --- modules/image/image.module 21 Jul 2009 07:09:46 -0000 1.6 +++ modules/image/image.module 16 Aug 2009 21:18:36 -0000 @@ -16,7 +16,7 @@ function image_help($path, $arg) { $naming_approaches[] = t('Based on where it will be used: !name', array('!name' => 'profile-picture')); $naming_approaches[] = t('Describing its appearance: !name', array('!name' => 'square-85x85')); $output = ''; - $output .= '

' . t('The Image module provides functionality for displaying images on your site though image styles.', array('!url' => url('admin/settings/image-styles'))) .'

'; + $output .= '

' . t('The Image module provides functionality for displaying images on your site though image styles.', array('!url' => url('admin/config/media/image-styles'))) .'

'; $output .= '

' . t('Image styles') . '

'; $output .= '

' . t('Image styles allow your site to output an image in several different ways without affecting the original image. Any created images will automatically be refreshed if any changes are made to the image style.') .'

'; $output .= '

' . t('Every image style must have a name, which will be used in the URL of generated images. There are two common approaches to naming image styles:') . '

'; @@ -24,10 +24,10 @@ function image_help($path, $arg) { $output .= '

' . t('Both approaches are common and which you choose depends on how you use the image style.') . '

'; $output .= '

' . t('After creating an image style, effects may be added to the style. Image module comes with some basic effects such as crop, scale, desaturate, and rotate. In addition to the effects included with Image, other modules may provide additional effects. Multiple effects may be combined together, such as using the crop and scale effect and the desaturate effect, you could create square, grayscale thumbnails.'); return $output; - case 'admin/settings/image-styles': + case 'admin/config/media/image-styles': return '

' . t('Image styles commonly provide thumbnail sizes by scaling and cropping images, but can also add various effects before an image is displayed. When an image is displayed with a style, a new file is created and the original image is left unchanged.') . '

'; - case 'admin/settings/image-styles/edit/%/add/%': - case 'admin/settings/image-styles/edit/%/effects/%': + case 'admin/config/media/image-styles/edit/%/add/%': + case 'admin/config/media/image-styles/edit/%/effects/%': $effect = ($arg[5] == 'add') ? image_effect_definition_load($arg[6]) : image_effect_load($arg[6]); return isset($effect['help']) ? ('

' . $effect['help'] . '

') : NULL; } @@ -46,13 +46,13 @@ function image_menu() { 'access callback' => TRUE, 'type' => MENU_CALLBACK, ); - $items['admin/settings/image-styles'] = array( + $items['admin/config/media/image-styles'] = array( 'title' => 'Image styles', 'description' => 'Configure styles that can be used for resizing or adjusting images on display.', 'page callback' => 'image_style_list', 'access arguments' => array('administer image styles'), ); - $items['admin/settings/image-styles/list'] = array( + $items['admin/config/media/image-styles/list'] = array( 'title' => 'List', 'description' => 'List the current image styles on the site.', 'page callback' => 'image_style_list', @@ -60,7 +60,7 @@ function image_menu() { 'type' => MENU_DEFAULT_LOCAL_TASK, 'weight' => 1, ); - $items['admin/settings/image-styles/add'] = array( + $items['admin/config/media/image-styles/add'] = array( 'title' => 'Add style', 'description' => 'Add a new image style.', 'page callback' => 'drupal_get_form', @@ -69,7 +69,7 @@ function image_menu() { 'type' => MENU_LOCAL_TASK, 'weight' => 2, ); - $items['admin/settings/image-styles/edit/%image_style'] = array( + $items['admin/config/media/image-styles/edit/%image_style'] = array( 'title' => 'Edit style', 'title callback' => 'image_style_title', 'title arguments' => array('!name', 4), @@ -79,7 +79,7 @@ function image_menu() { 'access arguments' => array('administer image styles'), 'type' => MENU_CALLBACK, ); - $items['admin/settings/image-styles/delete/%image_style'] = array( + $items['admin/config/media/image-styles/delete/%image_style'] = array( 'title' => 'Delete style', 'title callback' => 'image_style_title', 'title arguments' => array('Delete !name', 4), @@ -89,7 +89,7 @@ function image_menu() { 'access arguments' => array('administer image styles'), 'type' => MENU_CALLBACK, ); - $items['admin/settings/image-styles/edit/%image_style/effects/%image_effect'] = array( + $items['admin/config/media/image-styles/edit/%image_style/effects/%image_effect'] = array( 'title' => 'Edit image effect', 'title callback' => 'image_effect_title', 'title arguments' => array('!label effect', 6), @@ -99,7 +99,7 @@ function image_menu() { 'access arguments' => array('administer image styles'), 'type' => MENU_CALLBACK, ); - $items['admin/settings/image-styles/edit/%image_style/effects/%image_effect/delete'] = array( + $items['admin/config/media/image-styles/edit/%image_style/effects/%image_effect/delete'] = array( 'title' => 'Delete image effect', 'title callback' => 'image_effect_title', 'title arguments' => array('Delete !label', 6), @@ -109,7 +109,7 @@ function image_menu() { 'access arguments' => array('administer image styles'), 'type' => MENU_CALLBACK, ); - $items['admin/settings/image-styles/edit/%image_style/add/%image_effect_definition'] = array( + $items['admin/config/media/image-styles/edit/%image_style/add/%image_effect_definition'] = array( 'title' => 'Add image effect', 'title callback' => 'image_effect_title', 'title arguments' => array('Add !label effect', 6), Index: modules/image/image.test =================================================================== RCS file: /cvs/drupal/drupal/modules/image/image.test,v retrieving revision 1.5 diff -u -p -r1.5 image.test --- modules/image/image.test 21 Jul 2009 07:09:46 -0000 1.5 +++ modules/image/image.test 16 Aug 2009 21:19:13 -0000 @@ -281,7 +281,7 @@ class ImageAdminStylesUnitTest extends D function testStyle() { // Setup a style to be created and effects to add to it. $style_name = strtolower($this->randomName(10)); - $style_path = 'admin/settings/image-styles/edit/' . $style_name; + $style_path = 'admin/config/media/image-styles/edit/' . $style_name; $effect_edits = array( 'image_resize' => array( 'data[width]' => 100, @@ -316,7 +316,7 @@ class ImageAdminStylesUnitTest extends D $edit = array( 'name' => $style_name, ); - $this->drupalPost('admin/settings/image-styles/add', $edit, t('Create new style')); + $this->drupalPost('admin/config/media/image-styles/add', $edit, t('Create new style')); $this->assertRaw(t('Style %name was created.', array('%name' => $style_name)), t('Image style successfully created.')); // Add effect form. @@ -375,7 +375,7 @@ class ImageAdminStylesUnitTest extends D $this->drupalPost($style_path, $edit, t('Update style')); // Note that after changing the style name, the style path is changed. - $style_path = 'admin/settings/image-styles/edit/' . $style_name; + $style_path = 'admin/config/media/image-styles/edit/' . $style_name; // Check that the URL was updated. $this->drupalGet($style_path); @@ -415,7 +415,7 @@ class ImageAdminStylesUnitTest extends D // Style deletion form. // Delete the style. - $this->drupalPost('admin/settings/image-styles/delete/' . $style_name, array(), t('Delete')); + $this->drupalPost('admin/config/media/image-styles/delete/' . $style_name, array(), t('Delete')); // Confirm the style directory has been removed. $directory = file_directory_path() . '/styles/' . $style_name; 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 16 Aug 2009 21:28:46 -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': @@ -695,34 +695,43 @@ function system_menu() { 'page arguments' => array('system_performance_settings'), 'access arguments' => array('administer site configuration'), ); - - // Settings. - $items['admin/settings/site-information'] = array( - 'title' => 'Site information', - 'description' => 'Change basic site information, such as the site name, slogan, e-mail address, mission, front page and more.', + $items['admin/config/media'] = array( + 'title' => 'Media', + 'description' => 'Media tools.', + 'position' => 'left', + 'weight' => 10, + 'page callback' => 'system_admin_menu_block_page', + 'access callback' => 'system_admin_menu_block_access', + 'access arguments' => array('admin/config/media', 'access administration pages'), + ); + $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', - 'page arguments' => array('system_site_information_settings'), + 'page arguments' => array('system_performance_settings'), 'access arguments' => array('administer site configuration'), ); - $items['admin/config/development/logging'] = array( - 'title' => 'Logging and errors', - 'description' => "Settings for logging and alerts modules. Various modules can route Drupal's system events to different destinations, such as syslog, database, email, etc.", + $items['admin/config/media/image-toolkit'] = array( + 'title' => 'Image toolkit', + 'description' => 'Choose which image toolkit to use if you have installed optional toolkits.', 'page callback' => 'drupal_get_form', - 'page arguments' => array('system_logging_settings'), + 'page arguments' => array('system_image_toolkit_settings'), 'access arguments' => array('administer site configuration'), ); - $items['admin/settings/file-system'] = array( - 'title' => 'File system', - 'description' => 'Tell Drupal where to store uploaded files and how they are accessed.', + $items['admin/config/development/logging'] = array( + 'title' => 'Logging and errors', + 'description' => "Settings for logging and alerts modules. Various modules can route Drupal's system events to different destinations, such as syslog, database, email, etc.", 'page callback' => 'drupal_get_form', - 'page arguments' => array('system_file_system_settings'), + 'page arguments' => array('system_logging_settings'), 'access arguments' => array('administer site configuration'), ); - $items['admin/settings/image-toolkit'] = array( - 'title' => 'Image toolkit', - 'description' => 'Choose which image toolkit to use if you have installed optional toolkits.', + + // Settings. + $items['admin/settings/site-information'] = array( + 'title' => 'Site information', + 'description' => 'Change basic site information, such as the site name, slogan, e-mail address, mission, front page and more.', 'page callback' => 'drupal_get_form', - 'page arguments' => array('system_image_toolkit_settings'), + 'page arguments' => array('system_site_information_settings'), 'access arguments' => array('administer site configuration'), ); $items['admin/settings/rss-publishing'] = array( Index: modules/upload/upload.admin.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/upload/upload.admin.inc,v retrieving revision 1.12 diff -u -p -r1.12 upload.admin.inc --- modules/upload/upload.admin.inc 21 May 2009 12:00:06 -0000 1.12 +++ modules/upload/upload.admin.inc 16 Aug 2009 21:30:27 -0000 @@ -75,7 +75,7 @@ function upload_admin_settings() { '#default_value' => variable_get('upload_max_resolution', 0), '#size' => 15, '#maxlength' => 10, - '#description' => t('The maximum allowed image size (e.g. 640x480). Set to 0 for no restriction. If an image toolkit is installed, files exceeding this value will be scaled down to fit.', array('!image-toolkit-link' => url('admin/settings/image-toolkit'))), + '#description' => t('The maximum allowed image size (e.g. 640x480). Set to 0 for no restriction. If an image toolkit is installed, files exceeding this value will be scaled down to fit.', array('!image-toolkit-link' => url('admin/config/media/image-toolkit'))), '#field_suffix' => '' . t('WIDTHxHEIGHT') . '' ); $form['settings_general']['upload_list_default'] = array( 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.'); Index: modules/user/user.admin.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/user/user.admin.inc,v retrieving revision 1.67 diff -u -p -r1.67 user.admin.inc --- modules/user/user.admin.inc 11 Aug 2009 11:47:58 -0000 1.67 +++ modules/user/user.admin.inc 16 Aug 2009 21:20:07 -0000 @@ -366,7 +366,7 @@ function user_admin_settings() { '#title' => t('Picture display style'), '#options' => image_style_options(TRUE), '#default_value' => variable_get('user_picture_style', ''), - '#description' => t('The style selected will be used on display, while the original image is retained. Styles may be configured in the Image styles administration area.', array('!url' => url('admin/settings/image-styles'))), + '#description' => t('The style selected will be used on display, while the original image is retained. Styles may be configured in the Image styles administration area.', array('!url' => url('admin/config/media/image-styles'))), ); } $form['personalization']['pictures']['user_picture_dimensions'] = array(