summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSam Boyer2008-08-31 15:50:55 (GMT)
committer Sam Boyer2008-08-31 15:50:55 (GMT)
commita351fd4fc87dee7b6fa59c8dd46c47d0b549c6fe (patch)
treebdf7e9be347639c60e53a15ab8f17710e97f4ac5
parent6323a95c9415827a415c04fdfe0fb85433430a33 (diff)
by douggreen: D6 FAPI and l(), url() compliance.
-rw-r--r--panels_page/panels_page.admin.inc12
1 files changed, 6 insertions, 6 deletions
diff --git a/panels_page/panels_page.admin.inc b/panels_page/panels_page.admin.inc
index a14bd45..350c49f 100644
--- a/panels_page/panels_page.admin.inc
+++ b/panels_page/panels_page.admin.inc
@@ -52,10 +52,10 @@ function panels_page_list_page() {
}
else {
if (empty($panel_page->disabled)) {
- $ops[] = l(t('Disable'), "admin/panels/panel-page/disable/$panel_page->name", NULL, drupal_get_destination());
+ $ops[] = l(t('Disable'), "admin/panels/panel-page/disable/$panel_page->name", array('query' => drupal_get_destination()));
}
else {
- $ops[] = l(t('Enable'), "admin/panels/panel-page/enable/$panel_page->name", NULL, drupal_get_destination());
+ $ops[] = l(t('Enable'), "admin/panels/panel-page/enable/$panel_page->name", array('query' => drupal_get_destination()));
}
}
@@ -175,11 +175,11 @@ function panels_page_delete_confirm(&$form_state, $panel_page) {
/**
* Handle the submit button to delete a panel page.
*/
-function panels_page_delete_confirm_submit($form_id, $form) {
- if ($form['confirm']) {
+function panels_page_delete_confirm_submit($form, &$form_state) {
+ if ($form_state['values']['confirm']) {
panels_page_delete((object) $form);
// TODO: Is this necessary or did we feed it the location already?
- return 'admin/panels/panel-page';
+ $form_state['redirect'] = 'admin/panels/panel-page';
}
}
@@ -921,7 +921,7 @@ function panels_page_admin_view_submit($form, &$form_state) {
if (!empty($form_state['values']['additional'])) {
$url .= "/" . $form_state['values']['additional'];
}
- return $url;
+ $form_state['redirect'] = $url;
}