.

diff --git a/include/text.php b/include/text.php
index 37af65c70d1460888b4cd4bdd1c47569c76c3dcd..cc18181631bd07e423bdf211bda27869df4d080f 100644 (file)
--- 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 52a84e755e1dd0802b5d8e578c6447c0185fe921..281ce1dd414140d5d4cb3402df8c30d6f4b912ca 100644 (file)
--- 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 d0e709c753b3cd19ca77e053093aea1e7541bbc4..c5d7de59fe3e85a9bffda01512ac300436d18450 100644 (file)
--- 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 dd22e7d5b5295cca8ef8abf1e65e8f9a0812634a..63d344db3813356552f4767ff237325e19a7a144 100644 (file)
--- 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 2dd5df75855079153c9bb47e5b22736baa50b510..b09251cd5218b9b3120be3a675f27fe20b064477 100644 (file)
--- 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 5fceebd4bd87c006e2e5afeb60f7cfdb5c3d1379..85e1f9faa098b6af371e408e4f3b8677982acbfa 100644 (file)
--- 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 d22fea6ffc8df6245b0446d01449fbe5be2aa6c9..d150b2e1e42488b7910cdff737a06d5cc9265a31 100644 (file)
--- 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;
 }