From 7ee07daf04e516900fb1d9c77debf7f2b7f91fc8 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Tue, 27 Mar 2012 18:39:52 -0700
Subject: use theme directory for page templates, not language directory

---
 index.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'index.php')

diff --git a/index.php b/index.php
index 5f6d74adb..0916ed8b1 100755
--- a/index.php
+++ b/index.php
@@ -342,13 +342,13 @@ $profile = $a->profile;
 
 header("Content-type: text/html; charset=utf-8");
 
-$template = 'view/' . $lang . '/' 
+$template = 'view/' . current_theme() . '/' 
 	. ((x($a->page,'template')) ? $a->page['template'] : 'default' ) . '.php';
 
 if(file_exists($template))
 	require_once($template);
 else
-	require_once(str_replace($lang . '/', '', $template));
+	require_once(str_replace(current_theme() . '/', '', $template));
 
 session_write_close();
 exit;
-- 
cgit v1.2.3


From bb8beb26b4d87c27ce4c8dce3e1229a27a2d1a7e Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Thu, 29 Mar 2012 20:58:32 -0700
Subject: use zrl to get home again

---
 index.php | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'index.php')

diff --git a/index.php b/index.php
index 0916ed8b1..d4587b754 100755
--- a/index.php
+++ b/index.php
@@ -93,6 +93,9 @@ if((x($_SESSION,'language')) && ($_SESSION['language'] !== $lang)) {
 	load_translation_table($lang);
 }
 
+if(x($_GET,'zurl')) {
+	$_SESSION['my_url'] = $_GET['zurl'];
+}
 
 /**
  *
-- 
cgit v1.2.3


From e2c295c01f92cf9a1550a231296ff4723172592b Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Thu, 29 Mar 2012 21:44:30 -0700
Subject: another silly mistake

---
 index.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'index.php')

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'];
 }
 
 /**
-- 
cgit v1.2.3


From 7df6ab9a87bb564b9484b1fb0ab9f4a11bf97889 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Sun, 1 Apr 2012 22:22:26 -0700
Subject: add page_content_top hook

---
 index.php | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'index.php')

diff --git a/index.php b/index.php
index 2faac1f28..a51e33e26 100755
--- a/index.php
+++ b/index.php
@@ -243,6 +243,8 @@ if (file_exists($theme_info_file)){
 if(! x($a->page,'content'))
 	$a->page['content'] = '';
 
+if(! $install)
+	call_hooks('page_content_top',$a->page['content']);
 
 /**
  * Call module functions
-- 
cgit v1.2.3


From 62e528ba43bedbd33eb81447775bd743f0c1acf8 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Mon, 2 Apr 2012 00:45:45 -0700
Subject: remove zrl from query string

---
 index.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'index.php')

diff --git a/index.php b/index.php
index a51e33e26..e7227962f 100755
--- a/index.php
+++ b/index.php
@@ -95,6 +95,7 @@ if((x($_SESSION,'language')) && ($_SESSION['language'] !== $lang)) {
 
 if(x($_GET,'zrl')) {
 	$_SESSION['my_url'] = $_GET['zrl'];
+	$a->query_string = preg_replace('/[\?&]zrl=(.*?)([\?&]|$)/is','',$a->query_string);
 }
 
 /**
-- 
cgit v1.2.3