Index: modules/block.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/block.module,v
retrieving revision 1.140
diff -u -r1.140 block.module
--- modules/block.module	31 Oct 2004 07:34:47 -0000	1.140
+++ modules/block.module	31 Oct 2004 12:19:02 -0000
@@ -33,8 +33,8 @@
       return t("
 <p>Blocks are the boxes in the left and right side bars of the web site. They are made available by modules or created manually.</p>
 <p>Only enabled blocks are shown. You can position the blocks by deciding which side of the page they will show up on (region) and in which order they appear (weight).</p>
-<p>If you want certain blocks to disable themselves temporarily during high server loads, check the 'Throttle' box. You will need to enable the auto-throttle on the <a href=\"%throttle\">throttle configuration page</a> after having enabled the throttle module.
-", array('%throttle' => url('admin/settings/throttle')));
+<p>If you want certain blocks to disable themselves temporarily during high server loads, check the 'Throttle' box. You will need to enable the auto-throttle on the <a href=\"%throttle\">throttle configuration page</a> after having enabled the throttle module on the <a href=\"%modules-overview\">modules overview page</a>.
+", array('%throttle' => url('admin/settings/throttle'), '%modules-overview' => url('admin/modules')));
     case 'admin/block/add':
       return t("Here you can create a new block. Once you have created this block you must make it active and give it a place on the page using <a href=\"%overview\">blocks</a>. The title is used when displaying the block. The description is used in the \"block\" column on the <a href=\"%overview\">blocks</a> page.", array('%overview' => url('admin/block')));
   }
@@ -189,7 +189,7 @@
 function block_admin_display() {
   $blocks = _block_rehash();
 
-  $header = array(t('Block'), t('Enabled'), t('Throttle'), t('Weight'), t('Region'), array('data' => t('Operations'), 'colspan' => 2));
+  $header = array(t('Block'), t('Enabled'), (module_exist('throttle') ? t('Throttle') : ''), t('Weight'), t('Region'), array('data' => t('Operations'), 'colspan' => 2));
 
   foreach ($blocks as $block) {
     if ($block['module'] == 'block') {
@@ -199,7 +199,7 @@
       $operation = '';
     }
 
-    $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'] .'][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'))), l(t('configure'), 'admin/block/configure/'. $block['module'] .'/'. $block['delta']), $operation);
+    $rows[] = array($block['info'], array('data' => form_checkbox(NULL, $block['module'] .']['. $block['delta'] .'][status', 1, $block['status']), 'align' => 'center'), (module_exist('throttle') ? array('data' => form_checkbox(NULL, $block['module'] .']['. $block['delta'] .'][throttle', 1, $block['throttle'], NULL), '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'))), l(t('configure'), 'admin/block/configure/'. $block['module'] .'/'. $block['delta']), $operation);
   }
 
   $output = theme('table', $header, $rows);