Index: system.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/system.module,v
retrieving revision 1.182.2.1
diff -u -r1.182.2.1 system.module
--- system.module	30 Nov 2004 18:40:48 -0000	1.182.2.1
+++ system.module	9 Sep 2005 02:43:00 -0000
@@ -20,7 +20,8 @@
     case 'admin/themes/settings':
       return t('These options control the default display settings for your entire site, across all themes. Unless they have been overridden by a specific theme, these settings will be used.');
     case 'admin/themes/settings/'. arg(3):
-      $theme = array_pop(explode('.', arg(3), 2));
+      $arg3 = explode('.', arg(3), 2);
+      $theme = array_pop($arg3);
       return t('These options control the display settings for the <code>%template</code> theme. When your site is displayed using this theme, these settings will be used. By clicking "Reset to defaults," you can choose to use the <a href="%global">global settings</a> for this theme.', array('%template' => $theme, '%global' => url('admin/themes/settings')));
     case 'admin/modules':
       return t("Modules are plugins for Drupal that extend its core functionality.  Here you can select which modules are enabled.  Click on the name of the module in the navigation menu for their individual configuration pages.  Once a module is enabled, new <a href=\"%permissions\">permissions</a> might be made available.  Modules can automatically be temporarily disabled to reduce server load when your site becomes extremely busy by checking throttle.  The auto-throttle functionality must be enabled on the <a href=\"%throttle\">throttle configuration page</a> after having enabled the throttle module.", array('%permissions' => url('admin/user/configure/permission'), '%throttle' => url('admin/settings/throttle')));
@@ -635,7 +636,8 @@
     $group = form_checkbox(t('Use the default logo'), "$var][default_logo", 1, $settings['default_logo'], t('Check here if you want the theme to use the logo supplied with it.'));
     $group .= form_textfield(t('Path to custom logo'), "$var][logo_path", $settings['logo_path'], 50, 128, t('The path to the file you would like to use as your logo file instead of the default logo.'));
 
-    file_check_directory(variable_get('file_directory_path', 'files'), FILE_CREATE_DIRECTORY, 'file_directory_path');
+    $directory_path = variable_get('file_directory_path', 'files');
+    file_check_directory($directory_path, FILE_CREATE_DIRECTORY, 'file_directory_path');
     $group .= form_file(t('Upload logo image'), 'logo_upload', 40, t("If you don't have direct file access to the server, use this field to upload your logo."));
     $group .= form_button(t('Upload'), 'fileop');
 
Index: user.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/user.module,v
retrieving revision 1.407.2.12
diff -u -r1.407.2.12 user.module
--- user.module	1 Jun 2005 19:27:12 -0000	1.407.2.12
+++ user.module	9 Sep 2005 02:43:02 -0000
@@ -1271,7 +1271,8 @@
   $output .= form_group(t('User email settings'), $group);
 
   // Picture settings.
-  file_check_directory(file_create_path(variable_get('user_picture_path', 'pictures')), 1, 'user_picture_path');
+  $picture_path = file_create_path(variable_get('user_picture_path', 'pictures'));
+  file_check_directory($picture_path, 1, 'user_picture_path');
 
   $group  = form_radios(t('Picture support'), 'user_pictures', variable_get('user_pictures', 0), array(t('Disabled'), t('Enabled')), t('Enable picture support.'));
   $group .= form_textfield(t('Picture image path'), 'user_picture_path', variable_get('user_picture_path', 'pictures'), 45, 255, t('Subdirectory in the directory "%dir" where pictures will be stored.', array('%dir' => variable_get('file_directory_path', 'files') .'/')));