summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
authorDries Buytaert <dries@buytaert.net>2008-12-20 05:20:21 +0000
committerDries Buytaert <dries@buytaert.net>2008-12-20 05:20:21 +0000
commitee700371aca60269b9c752d1e143cae64d18a745 (patch)
tree0b1a841aa4adb127b7b57bb1bf3eb4f8e47a4d1e /modules
parent1415f6b74390ec844ccf42d281b6eddcbb11c84e (diff)
downloadbrdo-ee700371aca60269b9c752d1e143cae64d18a745.tar.gz
brdo-ee700371aca60269b9c752d1e143cae64d18a745.tar.bz2
- Patch #319404 by Dave Reid: simplify actions_sychronize and remove paramater.
Diffstat (limited to 'modules')
-rw-r--r--modules/system/system.module4
-rw-r--r--modules/trigger/trigger.install2
2 files changed, 3 insertions, 3 deletions
diff --git a/modules/system/system.module b/modules/system/system.module
index ad56aea37..3e77dde00 100644
--- a/modules/system/system.module
+++ b/modules/system/system.module
@@ -1607,8 +1607,8 @@ function system_action_info() {
*/
function system_actions_manage() {
$output = '';
+ actions_synchronize();
$actions = actions_list();
- actions_synchronize($actions);
$actions_map = actions_actions_map($actions);
$options = array(t('Choose an advanced action'));
$unconfigurable = array();
@@ -1862,7 +1862,7 @@ function system_action_delete_orphans_post($orphaned) {
* Remove actions that are in the database but not supported by any enabled module.
*/
function system_actions_remove_orphans() {
- actions_synchronize(actions_list(), TRUE);
+ actions_synchronize(TRUE);
drupal_goto('admin/settings/actions/manage');
}
diff --git a/modules/trigger/trigger.install b/modules/trigger/trigger.install
index 03c8585bf..c6bb061b0 100644
--- a/modules/trigger/trigger.install
+++ b/modules/trigger/trigger.install
@@ -9,7 +9,7 @@ function trigger_install() {
drupal_install_schema('trigger');
// Do initial synchronization of actions in code and the database.
- actions_synchronize(actions_list());
+ actions_synchronize();
}
/**