diff --git a/redirect.api.php b/redirect.api.php index fa483fc..f38d715 100644 --- a/redirect.api.php +++ b/redirect.api.php @@ -275,40 +275,6 @@ function hook_redirect_delete($redirect) { } /** - * Respond to redirect disabling. - * - * This hook is invoked from redirect_disable_multiple() after the redirect has - * been disabled in the redirect table in the database. - * - * @param $redirect - * The redirect that is being disabled. - * - * @see redirect_disable_multiple() - * @ingroup redirect_api_hooks - */ -function hook_redirect_disable($redirect) { - -} - -/** - * Respond to redirect enabling. - * - * This hook is invoked from redirect_enable_multiple() after the redirect has - * been enabled in the redirect table in the database or from redirect_save() - * after the redirect has been changed from disabled to enabled. - * - * @param $redirect - * The redirect that is being enabled. - * - * @see redirect_enable_multiple() - * @see redirect_save() - * @ingroup redirect_api_hooks - */ -function hook_redirect_enable($redirect) { - -} - -/** * Act on a redirect being redirected. * * This hook is invoked from redirect_redirect() before the redirect callback diff --git a/redirect.module b/redirect.module index 564a359..cb01f00 100644 --- a/redirect.module +++ b/redirect.module @@ -795,15 +795,6 @@ function redirect_save($redirect) { $redirect->access = 0; } - // Invoke post-disable hooks if disabling a redirect. - if ($redirect->status == 0 && isset($redirect->original) && $redirect->original->status == 1) { - module_invoke_all('redirect_disable', $redirect); - } - // Invoke post-re-enable hooks if re-enabling a redirect. - if ($redirect->status == 1 && isset($redirect->original) && $redirect->original->status == 0) { - module_invoke_all('redirect_enable', $redirect); - } - // Allow other modules to alter the redirect before saving. module_invoke_all('redirect_presave', $redirect); module_invoke_all('entity_presave', $redirect, 'redirect'); @@ -865,22 +856,6 @@ function redirect_redirect_delete($redirect) { } /** - * Implements hook_redirect_enable(). - */ -function redirect_redirect_enable($redirect) { - $redirect_link = l($redirect->redirect, $redirect->redirect) . '=> ' . l($redirect->source, $redirect->source); - watchdog('redirect', t('Enabled redirect: !redirect_source_link', array('!redirect_link' => $redirect_link))); -} - -/** - * Implements hook_redirect_disable(). - */ -function redirect_redirect_disable($redirect) { - $redirect_link = l($redirect->redirect, $redirect->redirect) . '=> ' . l($redirect->source, $redirect->source); - watchdog('redirect', t('Disabled redirect: !redirect_source_link', array('!redirect_link' => $redirect_link))); -} - -/** * Delete a single URL redirect. * * @param $rid @@ -987,10 +962,19 @@ function redirect_change_status_multiple(array $rids, $status) { foreach ($redirects as $rid => $redirect) { $redirect->status = $status; redirect_save($redirect); + + if ($status) { + $redirect_link = l($redirect->redirect, $redirect->redirect) . '=> ' . l($redirect->source, $redirect->source); + watchdog('redirect', t('Enabled redirect: !redirect_source_link', array('!redirect_link' => $redirect_link))); + } + else { + $redirect_link = l($redirect->redirect, $redirect->redirect) . '=> ' . l($redirect->source, $redirect->source); + watchdog('redirect', t('Disabled redirect: !redirect_source_link', array('!redirect_link' => $redirect_link))); + } } - - // Clear the redirect_load_multiple cache. - entity_get_controller('redirect')->resetCache(); } }