Index: cmf.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/cmf/cmf.module,v
retrieving revision 1.2.2.4
diff -u -r1.2.2.4 cmf.module
--- cmf.module	12 Mar 2009 12:39:19 -0000	1.2.2.4
+++ cmf.module	13 May 2009 20:36:03 -0000
@@ -18,20 +18,11 @@
  * Implementation of hook_help().
  */
 function cmf_help($path, $arg) {
-
   $output = '';
-
   switch ($section) {
-
     case "admin/help#cmf":
-
-      $output .= '<p>'.  t('This module adds an easier way for administrators to filter the 
-        content on a Drupal site for administration purposes.') .'</p>';
-
-      $output .= '<p>'.  t('It\'s an improvement over the content page in the administration area 
-        of Drupal. It can show on the same page nodes and comments and adds new filters like role 
-        and author.') .'</p>';
-
+      $output .= '<p>'.  t("This module adds an easier way for administrators to filter the content on a Drupal site for administration purposes.") .'</p>';
+      $output .= '<p>'.  t("It's an improvement over the content page in the administration area of Drupal. It can show on the same page nodes and comments and adds new filters like role and author.") .'</p>';
       break;
   }
   return $output;
@@ -179,17 +170,11 @@
       $value = $filters[$type]['options'][$value];
     }
     // avoid not applicable filter verbose
-    if ($true && !($type == 'user' || $type == 'blocked' || $type == 'role')) {
-      $string = ($i++ ? '<em>and</em> where <strong>%a</strong> is <strong>%b</strong>' : 
-        '<strong>%a</strong> is <strong>%b</strong>');
-      $form['filters']['current'][] = array('#value' => t($string, 
-        array('%a' => $filters[$type]['title'] , '%b' => $value)));
+    if ($i++) {
+      $form['filters']['current'][] = array('#value' => t('<em>and</em> where <strong>%a</strong> is <strong>%b</strong>', array('%a' => $filters[$type]['title'], '%b' => $value)));
     }
     else {
-      $string = ($i++ ? '<em>and</em> where <strong>%a</strong> is <strong>%b</strong>' : 
-        '<strong>%a</strong> is <strong>%b</strong>');
-      $form['filters']['current'][] = array('#value' => t($string, 
-        array('%a' => $filters[$type]['title'] , '%b' => $value)));    
+      $form['filters']['current'][] = array('#value' => t('<strong>%a</strong> is <strong>%b</strong>', array('%a' => $filters[$type]['title'], '%b' => $value)));
     }
     // those ifs remove the respective option if it is already being filtered on.
     if ($type == 'type') {