diaspora continued...

[friendica.git] / mod / network.php

diff --git a/mod/network.php b/mod/network.php
index f05bf3e3443050d9f860ab823bf00d206bb1f677..05b74b50a4252782c7a9c410ea97cdfae4c46bea 100644 (file)
--- a/mod/network.php
+++ b/mod/network.php
@@ -126,6 +126,7 @@ function network_content(&$a, $update = 0) {
                        $o .= '<div id="live-network"></div>' . "\r\n";
                        $o .= "<script> var profile_uid = " . $_SESSION['uid'] 
                                . "; var netargs = '" . substr($a->cmd,8)
+                               . '?f='
                                . ((x($_GET,'cid')) ? '&cid=' . $_GET['cid'] : '')
                                . ((x($_GET,'search')) ? '&search=' . $_GET['search'] : '') 
                                . ((x($_GET,'star')) ? '&star=' . $_GET['star'] : '') 
@@ -296,9 +297,8 @@ function network_content(&$a, $update = 0) {
        $o .= conversation($a,$r,$mode,$update);
 
        if(! $update) {
-
                $o .= paginate($a);
-               $o .= '<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>';
+               $o .= cc_license();
        }
 
        return $o;