From 58752cfaa2b182c53e26ee42983ff41d59597b4c Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Mon, 10 Jul 2006 19:27:52 +0000
Subject: - Patch #72284 by me:    + reorganized ?q=admin/settings    +
 deprecated the _settings hook

---
 modules/upload/upload.module | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'modules/upload/upload.module')

diff --git a/modules/upload/upload.module b/modules/upload/upload.module
index fa1c6482e..c05562953 100644
--- a/modules/upload/upload.module
+++ b/modules/upload/upload.module
@@ -78,6 +78,11 @@ function upload_menu($may_cache) {
       'access' => user_access('upload files'),
       'type' => MENU_CALLBACK
     );
+    $items[] = array('path' => 'admin/settings/uploads',
+      'title' => t('file uploads'),
+      'callback' => 'upload_admin_settings',
+      'access' => user_access('administer site configuration'),
+      'type' => MENU_NORMAL_ITEM);
   }
   else {
     // Add handlers for previewing new uploads.
@@ -106,7 +111,7 @@ function upload_menu($may_cache) {
   return $items;
 }
 
-function upload_settings() {
+function upload_admin_settings() {
   $upload_extensions_default = variable_get('upload_extensions_default', 'jpg jpeg gif png txt html doc xls pdf ppt pps');
   $upload_uploadsize_default = variable_get('upload_uploadsize_default', 1);
   $upload_usersize_default = variable_get('upload_usersize_default', 10);
@@ -190,7 +195,7 @@ function upload_settings() {
     );
   }
 
-  return $form;
+  return system_settings_form('upload_admin_settings', $form);
 }
 
 function upload_download() {
-- 
cgit v1.2.3