aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorFriendika <info@friendika.com>2011-10-28 17:29:13 -0700
committerFriendika <info@friendika.com>2011-10-28 17:29:13 -0700
commite4dd2a5a9abd6a9952c2acb5b29628e4825f2904 (patch)
treed376cf74969ddadc04ce692b19d639000b6b3f32 /include
parentb02598185803e60b36b033ef3ccf05d1bd4d3af2 (diff)
downloadvolse-hubzilla-e4dd2a5a9abd6a9952c2acb5b29628e4825f2904.tar.gz
volse-hubzilla-e4dd2a5a9abd6a9952c2acb5b29628e4825f2904.tar.bz2
volse-hubzilla-e4dd2a5a9abd6a9952c2acb5b29628e4825f2904.zip
begin the name change
Diffstat (limited to 'include')
-rw-r--r--include/nav.php2
-rw-r--r--include/text.php3
2 files changed, 3 insertions, 2 deletions
diff --git a/include/nav.php b/include/nav.php
index 5c24df51e..62a8a6d11 100644
--- a/include/nav.php
+++ b/include/nav.php
@@ -147,7 +147,7 @@ function nav(&$a) {
$banner = get_config('system','banner');
if($banner === false)
- $banner .= '<a href="http://project.friendika.com"><img id="logo-img" src="images/friendika-32.png" alt="logo" /></a><span id="logo-text"><a href="http://project.friendika.com">Friendika</a></span>';
+ $banner .= '<a href="http://project.friendika.com"><img id="logo-img" src="images/friendika-32.png" alt="logo" /></a><span id="logo-text"><a href="http://project.friendika.com">Friendica</a></span>';
$tpl = get_markup_template('nav.tpl');
diff --git a/include/text.php b/include/text.php
index 8ada179dc..4726872ec 100644
--- a/include/text.php
+++ b/include/text.php
@@ -672,7 +672,7 @@ function smilies($s) {
$s = str_replace(
array( '&lt;3', '&lt;/3', '&lt;\\3', ':-)', ':)', ';-)', ':-(', ':(', ':-P', ':P', ':-"', ':-x', ':-X', ':-D', '8-|', '8-O',
- '~friendika', 'Diaspora*' ),
+ '~friendika', '~friendica', 'Diaspora*' ),
array(
'<img src="' . $a->get_baseurl() . '/images/smiley-heart.gif" alt="<3" />',
'<img src="' . $a->get_baseurl() . '/images/smiley-brokenheart.gif" alt="</3" />',
@@ -691,6 +691,7 @@ function smilies($s) {
'<img src="' . $a->get_baseurl() . '/images/smiley-surprised.gif" alt="8-|" />',
'<img src="' . $a->get_baseurl() . '/images/smiley-surprised.gif" alt="8-O" />',
'<a href="http://project.friendika.com">~friendika <img src="' . $a->get_baseurl() . '/images/friendika-16.png" alt="~friendika" /></a>',
+ '<a href="http://friendica.com">~friendica <img src="' . $a->get_baseurl() . '/images/friendika-16.png" alt="~friendica" /></a>',
'<a href="http://diasporafoundation.org">Diaspora<img src="' . $a->get_baseurl() . '/images/diaspora.png" alt="Diaspora*" /></a>',
), $s);