MrPetovan/friendica
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

missing entries on personal tab after sql text search optimise

Browse source
This commit is contained in:
friendica 2012-05-25 18:29:06 -07:00
parent bb4712b171
commit f5290a5a10
2 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
mod/network.php
View file

@ -414,16 +414,15 @@ function network_content(&$a, $update = 0) {
if($conv) { if($conv) {
$myurl = $a->get_baseurl() . '/profile/'. $a->user['nickname']; $myurl = $a->get_baseurl() . '/profile/'. $a->user['nickname'];
$myurl = substr($myurl,strpos($myurl,'://')+3); $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); $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' )) ", $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('%' . $myurl . '\\]%')), dbesc(protect_sprintf('%' . $myurl . ']%')),
dbesc(protect_sprintf('%' . $diasp_url . '\\]%')) dbesc(protect_sprintf('%' . $diasp_url . ']%'))
); );
} }
if($update) { if($update) {
// only setup pagination on initial page view // only setup pagination on initial page view

4
mod/wallmessage.php
View file

@ -44,7 +44,7 @@ function wallmessage_post(&$a) {
} }
// Work around doubled linefeeds in Tinymce 3.5b2 // Work around doubled linefeeds in Tinymce 3.5b2
dbg(1);
$body = str_replace("\r\n","\n",$body); $body = str_replace("\r\n","\n",$body);
$body = str_replace("\n\n","\n",$body); $body = str_replace("\n\n","\n",$body);
@ -67,7 +67,7 @@ dbg(1);
default: default:
info( t('Message sent.') . EOL ); info( t('Message sent.') . EOL );
} }
dbg(0);
// goaway($a->get_baseurl() . '/profile/' . $user['nickname']); // goaway($a->get_baseurl() . '/profile/' . $user['nickname']);
} }