From 6a9e22550d82595c4341290ca26e3afc5fe6300f Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Sat, 24 Sep 2011 05:45:34 -0700
Subject: .

---
 include/text.php  | 3 ---
 mod/display.php   | 2 --
 mod/friendika.php | 2 --
 mod/network.php   | 1 -
 mod/profile.php   | 1 -
 mod/register.php  | 3 +--
 mod/search.php    | 1 -
 7 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/include/text.php b/include/text.php
index 37af65c70..cc1818163 100644
--- a/include/text.php
+++ b/include/text.php
@@ -925,9 +925,6 @@ function base64url_decode($s) {
 	return base64_decode(strtr($s,'-_','+/'));
 }
 
-function cc_license() {
-return '<div class="cc-license">' . t('Shared content is covered by the <a href="http://creativecommons.org/licenses/by/3.0/">Creative Commons Attribution 3.0</a> license.') . '</div>';
-}
 
 if (!function_exists('str_getcsv')) {
     function str_getcsv($input, $delimiter = ',', $enclosure = '"', $escape = '\\', $eol = '\n') {
diff --git a/mod/display.php b/mod/display.php
index 52a84e755..281ce1dd4 100644
--- a/mod/display.php
+++ b/mod/display.php
@@ -114,8 +114,6 @@ function display_content(&$a) {
 
 	}
 
-	$o .= cc_license();
-
 	return $o;
 }
 
diff --git a/mod/friendika.php b/mod/friendika.php
index d0e709c75..c5d7de59f 100644
--- a/mod/friendika.php
+++ b/mod/friendika.php
@@ -42,8 +42,6 @@ function friendika_content(&$a) {
 	$o .= t('This is Friendika version') . ' ' . FRIENDIKA_VERSION . ' ';
 	$o .= t('running at web location') . ' ' . z_root() . '</p><p>';
 
-	$o .= t('Shared content within the Friendika network is provided under the <a href="http://creativecommons.org/licenses/by/3.0/">Creative Commons Attribution 3.0 license</a>') . '</p><p>';
-
 	$o .= t('Please visit <a href="http://project.friendika.com">Project.Friendika.com</a> to learn more about the Friendika project.') . '</p><p>';	
 
 	$o .= t('Bug reports and issues: please visit') . ' ' . '<a href="http://bugs.friendika.com">Bugs.Friendika.com</a></p><p>';
diff --git a/mod/network.php b/mod/network.php
index dd22e7d5b..63d344db3 100644
--- a/mod/network.php
+++ b/mod/network.php
@@ -374,7 +374,6 @@ function network_content(&$a, $update = 0) {
 
 	if(! $update) {
 		$o .= paginate($a);
-		$o .= cc_license();
 	}
 
 	return $o;
diff --git a/mod/profile.php b/mod/profile.php
index 2dd5df758..b09251cd5 100644
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -238,7 +238,6 @@ function profile_content(&$a, $update = 0) {
 
 	if(! $update) {
 		$o .= paginate($a);
-		$o .= cc_license();
 	}
 
 	return $o;
diff --git a/mod/register.php b/mod/register.php
index 5fceebd4b..85e1f9faa 100644
--- a/mod/register.php
+++ b/mod/register.php
@@ -501,8 +501,7 @@ function register_content(&$a) {
 	}
 
 
-	$license = cc_license();
-
+	$license = '';
 
 	$o = get_markup_template("register.tpl");
 	$o = replace_macros($o, array(
diff --git a/mod/search.php b/mod/search.php
index d22fea6ff..d150b2e1e 100644
--- a/mod/search.php
+++ b/mod/search.php
@@ -145,7 +145,6 @@ function search_content(&$a) {
 	$o .= conversation($a,$r,'search',false);
 
 	$o .= paginate($a);
-	$o .= cc_license();
 
 	return $o;
 }
-- 
cgit v1.2.3