Index: system.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/system.module,v
retrieving revision 1.213
diff -u -r1.213 system.module
--- system.module	1 Jun 2005 04:17:37 -0000	1.213
+++ system.module	1 Jun 2005 04:46:44 -0000
@@ -733,11 +733,14 @@
         'toggle_mission' => t('Mission statement'),
         'toggle_primary_links' => t('Primary links'),
         'toggle_secondary_links' => t('Secondary links'),
-        'toggle_node_user_picture' => t('User pictures in posts'),
-        'toggle_comment_user_picture' => t('User pictures in comments'),
         'toggle_search' => t('Search box'),
         'toggle_favicon' => t('Shortcut icon'));
 
+  if (variable_get('user_pictures', 0)) {
+    $toggles['toggle_node_user_picture'] = t('User pictures in posts');
+    $toggles['toggle_comment_user_picture'] = t('User pictures in comments');
+  }
+
   foreach ($toggles as $name => $title) {
     if ((!$key) || in_array($name, $features)) {
       // disable search box if search.module is disabled