diff options
| author | Dries Buytaert <dries@buytaert.net> | 2008-08-17 11:08:23 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2008-08-17 11:08:23 +0000 |
| commit | fee4182cb92b723e5e6e989e258cf85847235074 (patch) | |
| tree | dd36767c315862972c162eb8fb68fb4bc7cb5e4a /includes | |
| parent | 0b9e7c07e8eca7a4316e2daea78ddc59c41c1270 (diff) | |
| download | brdo-fee4182cb92b723e5e6e989e258cf85847235074.tar.gz brdo-fee4182cb92b723e5e6e989e258cf85847235074.tar.bz2 | |
- Patch #296300 by chx: remove edit[] and fixed Doxygen.
Diffstat (limited to 'includes')
| -rw-r--r-- | includes/common.inc | 6 | ||||
| -rw-r--r-- | includes/form.inc | 5 |
2 files changed, 1 insertions, 10 deletions
diff --git a/includes/common.inc b/includes/common.inc index dbec0f933..81ce85e5f 100644 --- a/includes/common.inc +++ b/includes/common.inc @@ -261,8 +261,7 @@ function drupal_get_destination() { * Usually the redirected URL is constructed from this function's input * parameters. However you may override that behavior by setting a * destination in either the $_REQUEST-array (i.e. by using - * the query string of an URI) or the $_REQUEST['edit']-array (i.e. by - * using a hidden form field). This is used to direct the user back to + * the query string of an URI) This is used to direct the user back to * the proper page after completing a form. For example, after editing * a post on the 'admin/content/node'-page or after having logged on using the * 'user login'-block in a sidebar. The function drupal_get_destination() @@ -298,9 +297,6 @@ function drupal_goto($path = '', $query = NULL, $fragment = NULL, $http_response if (isset($_REQUEST['destination'])) { extract(parse_url(urldecode($_REQUEST['destination']))); } - else if (isset($_REQUEST['edit']['destination'])) { - extract(parse_url(urldecode($_REQUEST['edit']['destination']))); - } $url = url($path, array('query' => $query, 'fragment' => $fragment, 'absolute' => TRUE)); // Remove newlines from the URL to avoid header injection attacks. diff --git a/includes/form.inc b/includes/form.inc index 202516960..f8341cc5b 100644 --- a/includes/form.inc +++ b/includes/form.inc @@ -1964,7 +1964,6 @@ function theme_image_button($element) { * * @param $element * An associative array containing the properties of the element. - * Properties used: value, edit * @return * A themed HTML string representing the hidden form field. * @@ -2481,10 +2480,6 @@ function batch_process($redirect = NULL, $url = NULL) { $batch['destination'] = $_REQUEST['destination']; unset($_REQUEST['destination']); } - elseif (isset($_REQUEST['edit']['destination'])) { - $batch['destination'] = $_REQUEST['edit']['destination']; - unset($_REQUEST['edit']['destination']); - } // Initiate db storage in order to get a batch id. We have to provide // at least an empty string for the (not null) 'token' column. |