From e4dd2a5a9abd6a9952c2acb5b29628e4825f2904 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Fri, 28 Oct 2011 17:29:13 -0700
Subject: [PATCH] begin the name change

---
 LICENSE          | 2 +-
 include/nav.php  | 2 +-
 include/text.php | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/LICENSE b/LICENSE
index 3136dd4f..65ec68b9 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2010, 2011 the Friendika Project
+Copyright (c) 2010, 2011 the Friendica Project
 All rights reserved.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
diff --git a/include/nav.php b/include/nav.php
index 5c24df51..62a8a6d1 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 8ada179d..4726872e 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);