This commit is contained in:
Friendika 2011-09-24 05:45:34 -07:00
parent b13f81bdc5
commit 6a9e22550d
7 changed files with 1 additions and 12 deletions

View file

@ -925,9 +925,6 @@ function base64url_decode($s) {
return base64_decode(strtr($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')) { if (!function_exists('str_getcsv')) {
function str_getcsv($input, $delimiter = ',', $enclosure = '"', $escape = '\\', $eol = '\n') { function str_getcsv($input, $delimiter = ',', $enclosure = '"', $escape = '\\', $eol = '\n') {

View file

@ -114,8 +114,6 @@ function display_content(&$a) {
} }
$o .= cc_license();
return $o; return $o;
} }

View file

@ -42,8 +42,6 @@ function friendika_content(&$a) {
$o .= t('This is Friendika version') . ' ' . FRIENDIKA_VERSION . ' '; $o .= t('This is Friendika version') . ' ' . FRIENDIKA_VERSION . ' ';
$o .= t('running at web location') . ' ' . z_root() . '</p><p>'; $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('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>'; $o .= t('Bug reports and issues: please visit') . ' ' . '<a href="http://bugs.friendika.com">Bugs.Friendika.com</a></p><p>';

View file

@ -374,7 +374,6 @@ function network_content(&$a, $update = 0) {
if(! $update) { if(! $update) {
$o .= paginate($a); $o .= paginate($a);
$o .= cc_license();
} }
return $o; return $o;

View file

@ -238,7 +238,6 @@ function profile_content(&$a, $update = 0) {
if(! $update) { if(! $update) {
$o .= paginate($a); $o .= paginate($a);
$o .= cc_license();
} }
return $o; return $o;

View file

@ -501,8 +501,7 @@ function register_content(&$a) {
} }
$license = cc_license(); $license = '';
$o = get_markup_template("register.tpl"); $o = get_markup_template("register.tpl");
$o = replace_macros($o, array( $o = replace_macros($o, array(

View file

@ -145,7 +145,6 @@ function search_content(&$a) {
$o .= conversation($a,$r,'search',false); $o .= conversation($a,$r,'search',false);
$o .= paginate($a); $o .= paginate($a);
$o .= cc_license();
return $o; return $o;
} }