From 0125b20cdab54dac2d0737123263cf6547d7623d Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Thu, 20 Aug 2009 10:48:03 +0000
Subject: - Patch #550228 by Bojhan: added 'Media' category on 'Configuration
 and modules' page.

---
 modules/upload/upload.admin.inc | 2 +-
 modules/upload/upload.module    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'modules/upload')

diff --git a/modules/upload/upload.admin.inc b/modules/upload/upload.admin.inc
index 6552f95a0..fbd2d7b0f 100644
--- a/modules/upload/upload.admin.inc
+++ b/modules/upload/upload.admin.inc
@@ -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 <a href="!image-toolkit-link">image toolkit</a> 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 <a href="!image-toolkit-link">image toolkit</a> is installed, files exceeding this value will be scaled down to fit.', array('!image-toolkit-link' => url('admin/config/media/image-toolkit'))),
     '#field_suffix' => '<kbd>' . t('WIDTHxHEIGHT') . '</kbd>'
   );
   $form['settings_general']['upload_list_default'] = array(
diff --git a/modules/upload/upload.module b/modules/upload/upload.module
index eec81dbe7..5682c6cf0 100644
--- a/modules/upload/upload.module
+++ b/modules/upload/upload.module
@@ -249,7 +249,7 @@ function upload_form_alter(&$form, $form_state, $form_id) {
       if (!file_prepare_directory($path, FILE_CREATE_DIRECTORY) || !file_prepare_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 <a href="@admin-file-system">file system configuration page</a>.', array('@admin-file-system' => url('admin/settings/file-system')));
+          $form['attachments']['#description'] .= ' ' . t('Please visit the <a href="@admin-file-system">file system configuration page</a>.', array('@admin-file-system' => url('admin/config/media/file-system')));
         }
         else {
           $form['attachments']['#description'] .= ' ' . t('Please contact the site administrator.');
-- 
cgit v1.2.3