harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
Devlon Duthie
2011-09-25 13:30:55 -05:00
parent cb1c6dd1e3 6a9e22550d
commit 3426ce5f94
10 changed files with 2 additions and 419 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mod/display.php
View File

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

2
mod/friendika.php
View File

@@ -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>';

1
mod/network.php
View File

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

1
mod/profile.php
View File

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

3
mod/register.php
View File

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

1
mod/search.php
View File

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