From 2ea85fd67e4fe61b56658eb7c3c13495438c60ba Mon Sep 17 00:00:00 2001
From: fabrixxm <fabrix.xm@gmail.com>
Date: Fri, 7 Jan 2011 16:36:09 +0100
Subject: show 'login' tab selected on login page

---
 include/nav.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'include')

diff --git a/include/nav.php b/include/nav.php
index 96acf826d..94a71d227 100644
--- a/include/nav.php
+++ b/include/nav.php
@@ -34,7 +34,10 @@
 		$a->page['nav'] .= '<a id="nav-logout-link" class="nav-link" href="logout">' . t('Logout') . "</a>\r\n";
 	}
 	else {
-		$a->page['nav'] .= '<a id="nav-login-link" class="nav-login-link" href="login">' . t('Login') . "</a>\r\n";
+		$a->page['nav'] .= '<a id="nav-login-link" class="nav-login-link';
+		if ($a->module == 'login') { $a->page['nav'] .= ' nav-selected';  }
+
+		$a->page['nav'] .= '" href="login">' . t('Login') . "</a>\r\n";
 	}
 
 	$a->page['nav'] .= "<span id=\"nav-link-wrapper\" >\r\n";
-- 
cgit v1.2.3


From c574e4c5879312f57db43436044285de56026f0b Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Thu, 20 Jan 2011 21:02:02 -0800
Subject: repair double-encoded double quotes

---
 include/items.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'include')

diff --git a/include/items.php b/include/items.php
index 1fdbc6fc2..f1169aeb4 100644
--- a/include/items.php
+++ b/include/items.php
@@ -636,8 +636,8 @@ function item_store($arr) {
 	// they came through. 
 
 	$arr['body']          = str_replace(
-								array('&amp;amp;','&amp;gt;','&amp;lt;'),
-								array('&amp;'    ,'&gt;'    ,'&lt;'),
+								array('&amp;amp;', '&amp;gt;', '&amp;lt;', '&amp;quot;'),
+								array('&amp;'    , '&gt;'    , '&lt;',     '&quot'),
 								$arr['body']
 							);
 
-- 
cgit v1.2.3