diff options
| author | friendica <info@friendica.com> | 2012-05-25 18:29:06 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2012-05-25 18:29:06 -0700 |
| commit | f5290a5a107ef2d6c309c4a3205319c9b0d13994 (patch) | |
| tree | 4bbcd661b2029bc37bfcd2a6cf324d9a4b3fc7c7 | |
| parent | bb4712b171f1c5ee02a49afc9ebff9bb8af3b052 (diff) | |
| download | volse-hubzilla-f5290a5a107ef2d6c309c4a3205319c9b0d13994.tar.gz volse-hubzilla-f5290a5a107ef2d6c309c4a3205319c9b0d13994.tar.bz2 volse-hubzilla-f5290a5a107ef2d6c309c4a3205319c9b0d13994.zip | |
missing entries on personal tab after sql text search optimise
| -rw-r--r-- | mod/network.php | 9 | ||||
| -rw-r--r-- | mod/wallmessage.php | 4 |
2 files changed, 6 insertions, 7 deletions
diff --git a/mod/network.php b/mod/network.php index f43eeb67e..fbfe2de4f 100644 --- a/mod/network.php +++ b/mod/network.php @@ -414,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 diff --git a/mod/wallmessage.php b/mod/wallmessage.php index 1a4882b64..cf349775c 100644 --- a/mod/wallmessage.php +++ b/mod/wallmessage.php @@ -44,7 +44,7 @@ function wallmessage_post(&$a) { } // Work around doubled linefeeds in Tinymce 3.5b2 -dbg(1); + $body = str_replace("\r\n","\n",$body); $body = str_replace("\n\n","\n",$body); @@ -67,7 +67,7 @@ dbg(1); default: info( t('Message sent.') . EOL ); } -dbg(0); + // goaway($a->get_baseurl() . '/profile/' . $user['nickname']); } |