aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2012-03-29 21:44:30 -0700
committerfriendica <info@friendica.com>2012-03-29 21:44:30 -0700
commite2c295c01f92cf9a1550a231296ff4723172592b (patch)
tree9c6ce502316dd77d79dcb598b877c6e26bd3a4e3
parent9332312ce93cd4b7113f31109d4c1dd1656f6189 (diff)
downloadvolse-hubzilla-e2c295c01f92cf9a1550a231296ff4723172592b.tar.gz
volse-hubzilla-e2c295c01f92cf9a1550a231296ff4723172592b.tar.bz2
volse-hubzilla-e2c295c01f92cf9a1550a231296ff4723172592b.zip
another silly mistake
-rwxr-xr-xinclude/nav.php6
-rwxr-xr-xindex.php4
2 files changed, 5 insertions, 5 deletions
diff --git a/include/nav.php b/include/nav.php
index d4f22e7ee..2c9c643a9 100755
--- a/include/nav.php
+++ b/include/nav.php
@@ -69,9 +69,9 @@ function nav(&$a) {
* "Home" should also take you home from an authenticated remote profile connection
*/
- $homelink = ((x($_SESSION,'visitor_home')) ? $_SESSION['visitor_home'] : '');
- if(get_my_url())
- $homelink = get_my_url();
+ $homelink = get_my_url();
+ if(! $homelink)
+ $homelink = ((x($_SESSION,'visitor_home')) ? $_SESSION['visitor_home'] : '');
if(($a->module != 'home') && (! (local_user())))
$nav['home'] = array($homelink, t('Home'), "", t('Home Page'));
diff --git a/index.php b/index.php
index d4587b754..2faac1f28 100755
--- a/index.php
+++ b/index.php
@@ -93,8 +93,8 @@ if((x($_SESSION,'language')) && ($_SESSION['language'] !== $lang)) {
load_translation_table($lang);
}
-if(x($_GET,'zurl')) {
- $_SESSION['my_url'] = $_GET['zurl'];
+if(x($_GET,'zrl')) {
+ $_SESSION['my_url'] = $_GET['zrl'];
}
/**