From 6a9e22550d82595c4341290ca26e3afc5fe6300f Mon Sep 17 00:00:00 2001 From: Friendika Date: Sat, 24 Sep 2011 05:45:34 -0700 Subject: [PATCH] . --- 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 37af65c70d..cc18181631 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 '
' . t('Shared content is covered by the Creative Commons Attribution 3.0 license.') . '
'; -} 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 52a84e755e..281ce1dd41 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 d0e709c753..c5d7de59fe 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() . '

'; - $o .= t('Shared content within the Friendika network is provided under the Creative Commons Attribution 3.0 license') . '

'; - $o .= t('Please visit Project.Friendika.com to learn more about the Friendika project.') . '

'; $o .= t('Bug reports and issues: please visit') . ' ' . 'Bugs.Friendika.com

'; diff --git a/mod/network.php b/mod/network.php index dd22e7d5b5..63d344db38 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 2dd5df7585..b09251cd52 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 5fceebd4bd..85e1f9faa0 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 d22fea6ffc..d150b2e1e4 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; }