diff options
| author | Michael <icarus@dabo.de> | 2012-05-26 11:59:19 +0200 |
|---|---|---|
| committer | Michael <icarus@dabo.de> | 2012-05-26 11:59:19 +0200 |
| commit | 7b3c02057db47a627b56bdd79f1055ea7f876617 (patch) | |
| tree | 8c9b11fa72e544aea721f385b40bff7254e42ed2 /mod/network.php | |
| parent | 6342b3e0bdd5774857a8fca809994f05e0208d25 (diff) | |
| parent | f5290a5a107ef2d6c309c4a3205319c9b0d13994 (diff) | |
| download | volse-hubzilla-7b3c02057db47a627b56bdd79f1055ea7f876617.tar.gz volse-hubzilla-7b3c02057db47a627b56bdd79f1055ea7f876617.tar.bz2 volse-hubzilla-7b3c02057db47a627b56bdd79f1055ea7f876617.zip | |
Merge remote branch 'upstream/master'
Diffstat (limited to 'mod/network.php')
| -rw-r--r-- | mod/network.php | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/mod/network.php b/mod/network.php index e59839ccc..fbfe2de4f 100644 --- a/mod/network.php +++ b/mod/network.php @@ -108,6 +108,10 @@ function network_content(&$a, $update = 0) { return login(false); } + $arr = array('query' => $a->query_string); + + call_hooks('network_content_init', $arr); + $o = ''; // item filter tabs @@ -157,7 +161,7 @@ function network_content(&$a, $update = 0) { $all_active = 'active'; } - + $postord_active = ''; if($all_active && x($_GET,'order') && $_GET['order'] !== 'comment') { @@ -410,16 +414,15 @@ function network_content(&$a, $update = 0) { if($conv) { $myurl = $a->get_baseurl() . '/profile/'. $a->user['nickname']; $myurl = substr($myurl,strpos($myurl,'://')+3); - $myurl = str_replace(array('www.','.'),array('','\\.'),$myurl); + $myurl = str_replace('www.','',$myurl); $diasp_url = str_replace('/profile/','/u/',$myurl); $sql_extra .= sprintf(" AND `item`.`parent` IN (SELECT distinct(`parent`) from item where ( `author-link` like '%s' or `tag` like '%s' or tag like '%s' )) ", - dbesc(protect_sprintf('%s' . $myurl)), - dbesc(protect_sprintf('%' . $myurl . '\\]%')), - dbesc(protect_sprintf('%' . $diasp_url . '\\]%')) + dbesc(protect_sprintf('%' . $myurl)), + dbesc(protect_sprintf('%' . $myurl . ']%')), + dbesc(protect_sprintf('%' . $diasp_url . ']%')) ); } - if($update) { // only setup pagination on initial page view |