--- modules/block.module	Thu Aug 12 17:36:06 2004
+++ block.module	Thu Aug 12 17:34:59 2004
@@ -181,8 +181,25 @@
       $delete = '';
     }
 
-    $rows[] = array($block['info'], array('data' => form_checkbox(NULL, $block['module'] .']['. $block['delta'] .'][status', 1, $block['status']), 'align' => 'center'), array('data' => form_checkbox(NULL, $block['module'] .']['. $block['delta'] .'][custom', 1, $block['custom']), 'align' => 'center'), array('data' => form_checkbox(NULL, $block['module'] .']['. $block['delta'] .'][throttle', 1, $block['throttle'], NULL, module_exist('throttle') ? NULL : array('disabled' => 'disabled')), 'align' => 'center'), form_weight(NULL, $block['module'] .']['. $block['delta'] .'][weight', $block['weight']), form_radios(NULL, $block['module'] .']['. $block['delta'] .'][region', $block['region'], array(t('left'), t('right'))), form_textfield(NULL, $block['module'] .']['. $block['delta'] .'][path', $block['path'], 10, 255),
-    $edit, $delete);
+    $rows[] = array($block['info'], 
+                    array('data' => form_checkbox(NULL, $block['module'] .']['. $block['delta'] .'][status', 1, 
+                                                  $block['status']), 
+                          'align' => 'center'), 
+                    array('data' => form_checkbox(NULL, $block['module'] .']['. $block['delta'] .'][custom', 1, 
+                                                  $block['custom']), 
+                          'align' => 'center'), 
+                    array('data' => form_select(NULL, $block['module'] .']['. $block['delta'] .'][throttle', 
+                                                $block['throttle'], array(0=>' ', 1=>1, 2=>2, 3=>3, 4=>4, 5=>5), NULL, module_exist('throttle') ? NULL : array('disabled' => 'disabled')), 
+                          'align' => 'center'), 
+                    form_weight(NULL, $block['module'] .']['. $block['delta'] .'][weight', 
+                                $block['weight']), 
+                    form_radios(NULL, $block['module'] .']['. $block['delta'] .'][region', 
+                                $block['region'], 
+                                array(t('left'), 
+                                      t('right'))), 
+                    form_textfield(NULL, $block['module'] .']['. $block['delta'] .'][path', 
+                                   $block['path'], 10, 255),
+                    $edit, $delete);
   }
 
   $output = theme('table', $header, $rows);
@@ -359,7 +376,7 @@
         ** Check the current throttle status and see if block should be displayed
         ** based on server load.
         */
-        if (!($block['throttle'] && (module_invoke('throttle', 'status') > 4))) {
+        if (!($block['throttle'] && (module_invoke('throttle', 'status') >= $block['throttle']))) {
           $block = array_merge($block, module_invoke($block['module'], 'block', 'view', $block['delta']));
         }
         if (isset($block['content']) && $block['content']) {
--- modules/system.module	Thu Aug 12 17:36:07 2004
+++ system.module	Thu Aug 12 17:11:27 2004
@@ -277,7 +277,7 @@
 
     $row = array($info->name, $info->description, array('data' => (in_array($filename, $required) ? form_hidden("status][$filename", 1) . t('required') : form_checkbox('', "status][$filename", 1, $file->status)), 'align' => 'center'));
     if ($type == 'module') {
-      $row[] = array('data' => (in_array($filename, $throttle_required) ? form_hidden("throttle][$filename", 0) . t('required') : form_checkbox(NULL, "throttle][$filename", 1, $file->throttle, NULL, module_exist('throttle') ? NULL : array('disabled' => 'disabled'))), 'align' => 'center');
+      $row[] = array('data' => (in_array($filename, $throttle_required) ? form_hidden("throttle][$filename", 0) . t('required') : form_select(NULL, "throttle][$filename", $file->throttle, array(0=>' ', 1=>1, 2=>2, 3=>3, 4=>4, 5=>5), NULL, module_exist('throttle') ? NULL : array('disabled' => 'disabled'))), 'align' => 'center');
     }
     else if ($type == 'theme') {
       $row[] = array('data' => form_radio('', 'theme_default', $info->name, (variable_get('theme_default', 0) == $info->name) ? 1 : 0), 'align' => 'center');