diff options
| author | Tobias Diekershoff <tobias.diekershoff@gmx.net> | 2011-01-21 07:09:51 +0100 |
|---|---|---|
| committer | Tobias Diekershoff <tobias.diekershoff@gmx.net> | 2011-01-21 07:09:51 +0100 |
| commit | bd512ab60c5128cec449a48e7d0736303f961e89 (patch) | |
| tree | e7675972310a06b55a5987dddb44beae63220a76 /include | |
| parent | ed37b1d166b22499c8f46e7f71e698a2985c9233 (diff) | |
| parent | c574e4c5879312f57db43436044285de56026f0b (diff) | |
| download | volse-hubzilla-bd512ab60c5128cec449a48e7d0736303f961e89.tar.gz volse-hubzilla-bd512ab60c5128cec449a48e7d0736303f961e89.tar.bz2 volse-hubzilla-bd512ab60c5128cec449a48e7d0736303f961e89.zip | |
Merge branch 'master' of git://github.com/friendika/friendika
Diffstat (limited to 'include')
| -rw-r--r-- | include/items.php | 4 | ||||
| -rw-r--r-- | include/nav.php | 5 |
2 files changed, 6 insertions, 3 deletions
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;','&gt;','&lt;'), - array('&' ,'>' ,'<'), + array('&amp;', '&gt;', '&lt;', '&quot;'), + array('&' , '>' , '<', '"'), $arr['body'] ); 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"; |