diff options
| author | Michael Vogel <icarus@dabo.de> | 2012-05-26 15:42:23 +0200 |
|---|---|---|
| committer | Michael Vogel <icarus@dabo.de> | 2012-05-26 15:42:23 +0200 |
| commit | a08232fa955385b2eaff5f9094b39071fb1632ae (patch) | |
| tree | b18ccde349d9f2a0dc06e32bdae0007b5953d4f9 /mod/network.php | |
| parent | 7f19d39b146844fd71d148690d3e550df9d3043b (diff) | |
| parent | 817fc37f41c030381507384db581f62d9a1b5044 (diff) | |
| download | volse-hubzilla-a08232fa955385b2eaff5f9094b39071fb1632ae.tar.gz volse-hubzilla-a08232fa955385b2eaff5f9094b39071fb1632ae.tar.bz2 volse-hubzilla-a08232fa955385b2eaff5f9094b39071fb1632ae.zip | |
Merge branch 'master' of github.com:annando/friendica
Diffstat (limited to 'mod/network.php')
| -rw-r--r-- | mod/network.php | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/mod/network.php b/mod/network.php index 6b4fa9a5b..a94272a42 100644 --- a/mod/network.php +++ b/mod/network.php @@ -426,7 +426,7 @@ 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); if (get_config('system','use_fulltext_engine')) $sql_extra .= sprintf(" AND `item`.`parent` IN (SELECT distinct(`parent`) from item where (MATCH(`author-link`) AGAINST ('".'"%s"'."' in boolean mode) or MATCH(`tag`) AGAINST ('".'"%s"'."' in boolean mode) or MATCH(tag) AGAINST ('".'"%s"'."' in boolean mode))) ", @@ -443,7 +443,6 @@ function network_content(&$a, $update = 0) { } - if($update) { // only setup pagination on initial page view |