? profiles/simpletest
? sites/default/modules
? sites/default/settings.php
Index: includes/actions.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/actions.inc,v
retrieving revision 1.22
diff -u -p -r1.22 actions.inc
--- includes/actions.inc	8 Nov 2008 07:28:03 -0000	1.22
+++ includes/actions.inc	27 Nov 2008 05:35:21 -0000
@@ -71,7 +71,7 @@ function actions_do($action_ids, $object
       $query->condition('aid', $conditions, 'IN');
       $result = $query->execute();
       foreach ($result as $action) {
-        $actions[$action->aid] = $action->parameters ? unserialize($action->parameters) : array();
+        $actions[$action->aid] = ($action->parameters != 'default') ? unserialize($action->parameters) : array();
         $actions[$action->aid]['callback'] = $action->callback;
         $actions[$action->aid]['type'] = $action->type;
       }
@@ -180,7 +180,7 @@ function actions_list($reset = FALSE) {
 function actions_get_all_actions() {
   $actions = db_query("SELECT aid, type, callback, parameters, description FROM {actions}")->fetchAllAssoc('aid', PDO::FETCH_ASSOC);
   foreach ($actions as &$action) {
-    $action['configurable'] = (bool) $action['parameters'];
+    $action['configurable'] = (bool) ($action['parameters'] != 'default');
     unset($action['parameters']);
     unset($action['aid']);
   }
@@ -236,7 +236,7 @@ function actions_function_lookup($hash) 
   }
 
   // Must be an instance; must check database.
-  return db_query("SELECT aid FROM {actions} WHERE MD5(aid) = :hash AND parameters <> ''", array(':hash' => $hash))->fetchField();
+  return db_query("SELECT aid FROM {actions} WHERE MD5(aid) = :hash AND parameters <> 'default'", array(':hash' => $hash))->fetchField();
 }
 
 /**
@@ -251,7 +251,7 @@ function actions_synchronize($actions_in
   if (!$actions_in_code) {
     $actions_in_code = actions_list(TRUE);
   }
-  $actions_in_db = db_query("SELECT aid, callback, description FROM {actions} WHERE parameters = ''")->fetchAllAssoc('callback', PDO::FETCH_ASSOC);
+  $actions_in_db = db_query("SELECT aid, callback, description FROM {actions} WHERE parameters = 'default'")->fetchAllAssoc('callback', PDO::FETCH_ASSOC);
 
   // Go through all the actions provided by modules.
   foreach ($actions_in_code as $callback => $array) {
@@ -269,7 +269,7 @@ function actions_synchronize($actions_in
             'aid' => $callback,
             'type' => $array['type'],
             'callback' => $callback,
-            'parameters' => '',
+            'parameters' => 'default',
             'description' => $array['description'],
             ))
           ->execute();
Index: modules/system/system.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.module,v
retrieving revision 1.649
diff -u -p -r1.649 system.module
--- modules/system/system.module	26 Nov 2008 18:56:16 -0000	1.649
+++ modules/system/system.module	27 Nov 2008 05:35:21 -0000
@@ -1609,13 +1609,13 @@ function system_actions_manage() {
   }
 
   $row = array();
-  $instances_present = db_fetch_object(db_query("SELECT aid FROM {actions} WHERE parameters <> ''"));
+  $instances_present = db_fetch_object(db_query("SELECT aid FROM {actions} WHERE parameters <> 'default'"));
   $header = array(
     array('data' => t('Action type'), 'field' => 'type'),
     array('data' => t('Description'), 'field' => 'description'),
     array('data' => $instances_present ? t('Operations') : '', 'colspan' => '2')
   );
-  $sql = 'SELECT * FROM {actions}';
+  $sql = "SELECT * FROM {actions} WHERE parameters <> 'default'";
   $result = pager_query($sql . tablesort_sql($header), 50);
   while ($action = db_fetch_object($result)) {
     $row[] = array(
@@ -1713,7 +1713,7 @@ function system_actions_configure($form_
   if (is_numeric($action)) {
     $aid = $action;
     // Load stored parameter values from database.
-    $data = db_fetch_object(db_query("SELECT * FROM {actions} WHERE aid = '%s'", $aid));
+    $data = db_fetch_object(db_query("SELECT * FROM {actions} WHERE aid = '%s' AND parameters <> 'default'", $aid));
     $edit['actions_description'] = $data->description;
     $edit['actions_type'] = $data->type;
     $function = $data->callback;