diff options
author | ewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2010-11-10 22:22:40 +0000 |
---|---|---|
committer | ewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2010-11-10 22:22:40 +0000 |
commit | c8f6c3c934df01bf969e3d91ae67f0887de10da9 (patch) | |
tree | d21179fda1e19d540eb3ea56b31584f86fc1e338 /actions | |
parent | a7801c71ecc6ce0f0d2a8fc82cdc779da9417aa4 (diff) | |
download | elgg-c8f6c3c934df01bf969e3d91ae67f0887de10da9.tar.gz elgg-c8f6c3c934df01bf969e3d91ae67f0887de10da9.tar.bz2 |
Fixes #2367: With fear and trepidation, converting events/plugin hooks to use elgg_ prefixed versions
git-svn-id: http://code.elgg.org/elgg/trunk@7284 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'actions')
-rw-r--r-- | actions/login.php | 2 | ||||
-rw-r--r-- | actions/plugins/settings/save.php | 2 | ||||
-rw-r--r-- | actions/register.php | 2 | ||||
-rw-r--r-- | actions/usersettings/save.php | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/actions/login.php b/actions/login.php index 67a2052b6..936d0a7d9 100644 --- a/actions/login.php +++ b/actions/login.php @@ -56,7 +56,7 @@ if ($result) { // // Returning FALSE to this function will generate a standard // // "Could not log you in" message. // // Plugins should use this hook to provide details, and then return TRUE. - // if (!trigger_plugin_hook('failed_login', 'user', $params, FALSE)) { + // if (!elgg_trigger_plugin_hook('failed_login', 'user', $params, FALSE)) { // register_error(elgg_echo('loginerror')); // } } diff --git a/actions/plugins/settings/save.php b/actions/plugins/settings/save.php index b67fa401f..2edf58e5b 100644 --- a/actions/plugins/settings/save.php +++ b/actions/plugins/settings/save.php @@ -41,7 +41,7 @@ if (elgg_action_exist("settings/$plugin/save")) { system_message(elgg_echo('plugins:settings:save:ok', array($plugin_name))); forward(REFERER); // -//$trigger = trigger_plugin_hook('plugin:save_settings', $plugin, $options, NULL); +//$trigger = elgg_trigger_plugin_hook('plugin:save_settings', $plugin, $options, NULL); //if ($trigger === NULL) { // foreach ($params as $k => $v) { // if (!$result = set_plugin_setting($k, $v, $plugin)) { diff --git a/actions/register.php b/actions/register.php index 3a45cb69b..566f6b1d4 100644 --- a/actions/register.php +++ b/actions/register.php @@ -44,7 +44,7 @@ if ($CONFIG->allow_registration) { ); // @todo should registration be allowed no matter what the plugins return? - if (!trigger_plugin_hook('register', 'user', $params, TRUE)) { + if (!elgg_trigger_plugin_hook('register', 'user', $params, TRUE)) { $new_user->delete(); // @todo this is a generic messages. We could have plugins // throw a RegistrationException, but that is very odd diff --git a/actions/usersettings/save.php b/actions/usersettings/save.php index 3e0117f06..6ee33ecd7 100644 --- a/actions/usersettings/save.php +++ b/actions/usersettings/save.php @@ -10,6 +10,6 @@ global $CONFIG; gatekeeper(); -trigger_plugin_hook('usersettings:save', 'user'); +elgg_trigger_plugin_hook('usersettings:save', 'user'); forward(REFERER); |