- Removed the "return" link from the node submission confirmation page.
parent
c79eb8c990
commit
00ee7f747b
|
@ -504,29 +504,6 @@ function drupal_goto($url) {
|
||||||
exit();
|
exit();
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
|
||||||
** Stores the referer in a persistent variable:
|
|
||||||
*/
|
|
||||||
|
|
||||||
function referer_save() {
|
|
||||||
if (!strstr(referer_uri(), request_uri())) {
|
|
||||||
$_SESSION["referer"] = referer_uri();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
** Restores the referer from a persistent variable:
|
|
||||||
*/
|
|
||||||
|
|
||||||
function referer_load() {
|
|
||||||
if (isset($_SESSION["referer"])) {
|
|
||||||
return $_SESSION["referer"];
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function valid_input_data($data) {
|
function valid_input_data($data) {
|
||||||
|
|
||||||
if (is_array($data) || is_object($data)) {
|
if (is_array($data) || is_object($data)) {
|
||||||
|
|
|
@ -1080,13 +1080,6 @@ function node_validate($node, &$error) {
|
||||||
|
|
||||||
function node_form($edit, $error = NULL) {
|
function node_form($edit, $error = NULL) {
|
||||||
|
|
||||||
/*
|
|
||||||
** Save the referer. We record where the user came from such that we
|
|
||||||
** can redirect him after having completed the node forms.
|
|
||||||
*/
|
|
||||||
|
|
||||||
referer_save();
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
** Validate the node:
|
** Validate the node:
|
||||||
*/
|
*/
|
||||||
|
@ -1413,10 +1406,6 @@ function node_submit($node) {
|
||||||
** useful links as where to go next.
|
** useful links as where to go next.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
if ($referer = referer_load()) {
|
|
||||||
$links[] = "<a href=\"$referer\">". t("return") ."</a>";
|
|
||||||
}
|
|
||||||
|
|
||||||
if ($node->nid && node_access("view", $node)) {
|
if ($node->nid && node_access("view", $node)) {
|
||||||
$links[] = l(t("view"), "node/view/$node->nid");
|
$links[] = l(t("view"), "node/view/$node->nid");
|
||||||
}
|
}
|
||||||
|
|
|
@ -1080,13 +1080,6 @@ function node_validate($node, &$error) {
|
||||||
|
|
||||||
function node_form($edit, $error = NULL) {
|
function node_form($edit, $error = NULL) {
|
||||||
|
|
||||||
/*
|
|
||||||
** Save the referer. We record where the user came from such that we
|
|
||||||
** can redirect him after having completed the node forms.
|
|
||||||
*/
|
|
||||||
|
|
||||||
referer_save();
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
** Validate the node:
|
** Validate the node:
|
||||||
*/
|
*/
|
||||||
|
@ -1413,10 +1406,6 @@ function node_submit($node) {
|
||||||
** useful links as where to go next.
|
** useful links as where to go next.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
if ($referer = referer_load()) {
|
|
||||||
$links[] = "<a href=\"$referer\">". t("return") ."</a>";
|
|
||||||
}
|
|
||||||
|
|
||||||
if ($node->nid && node_access("view", $node)) {
|
if ($node->nid && node_access("view", $node)) {
|
||||||
$links[] = l(t("view"), "node/view/$node->nid");
|
$links[] = l(t("view"), "node/view/$node->nid");
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue