aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Macgirvin <mike@macgirvin.com>2010-10-09 01:05:53 -0700
committerMike Macgirvin <mike@macgirvin.com>2010-10-09 01:05:53 -0700
commit948cb293023b64512ee4220ddc4198769d5eb938 (patch)
tree376eb2dab0b74b3338aad2e7f338300d7d524c71
parent9dc0e659d6b851c30f945ea8fe1e6f45bb9465dd (diff)
downloadvolse-hubzilla-948cb293023b64512ee4220ddc4198769d5eb938.tar.gz
volse-hubzilla-948cb293023b64512ee4220ddc4198769d5eb938.tar.bz2
volse-hubzilla-948cb293023b64512ee4220ddc4198769d5eb938.zip
after login from arbitrary page, send back to that page
-rw-r--r--include/auth.php4
-rw-r--r--view/theme/default/style.css2
2 files changed, 4 insertions, 2 deletions
diff --git a/include/auth.php b/include/auth.php
index 6a50362d6..e30b94d2e 100644
--- a/include/auth.php
+++ b/include/auth.php
@@ -71,8 +71,8 @@ else {
$a->cid = $r[0]['id'];
$_SESSION['cid'] = $a->cid;
}
-
-
+ if(($a->module !== 'home') && isset($_SESSION['return_url']))
+ goaway($a->get_baseurl() . '/' . $_SESSION['return_url']);
}
}
diff --git a/view/theme/default/style.css b/view/theme/default/style.css
index ea176b705..57d6ec5e9 100644
--- a/view/theme/default/style.css
+++ b/view/theme/default/style.css
@@ -97,7 +97,9 @@ blockquote:before {
#sysmsg {
width: 600px;
+ margin-bottom: 10px;
}
+
#top-margin {
height: 20px;
}