diff options
| author | Devlon Duthie <duthied@gmail.com> | 2011-09-25 13:30:55 -0500 |
|---|---|---|
| committer | Devlon Duthie <duthied@gmail.com> | 2011-09-25 13:30:55 -0500 |
| commit | 3426ce5f94b660d417b29fc2767b3c6487df8a4c (patch) | |
| tree | 5d1d63ce1f26d4e3ed7a23e7e9d7b3c16aeffe8b /mod | |
| parent | cb1c6dd1e37ccbbea47867faf0142e5d2f653624 (diff) | |
| parent | 6a9e22550d82595c4341290ca26e3afc5fe6300f (diff) | |
| download | volse-hubzilla-3426ce5f94b660d417b29fc2767b3c6487df8a4c.tar.gz volse-hubzilla-3426ce5f94b660d417b29fc2767b3c6487df8a4c.tar.bz2 volse-hubzilla-3426ce5f94b660d417b29fc2767b3c6487df8a4c.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'mod')
| -rw-r--r-- | mod/display.php | 2 | ||||
| -rw-r--r-- | mod/friendika.php | 2 | ||||
| -rw-r--r-- | mod/network.php | 1 | ||||
| -rw-r--r-- | mod/profile.php | 1 | ||||
| -rw-r--r-- | mod/register.php | 3 | ||||
| -rw-r--r-- | mod/search.php | 1 |
6 files changed, 1 insertions, 9 deletions
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 927f7b24e..739dcf0d3 100644 --- a/mod/network.php +++ b/mod/network.php @@ -408,7 +408,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; } |