aboutsummaryrefslogtreecommitdiffstats
path: root/mod
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2011-12-06 15:24:01 -0800
committerfriendica <info@friendica.com>2011-12-06 15:24:01 -0800
commit0c24784f5e92e0c8269f255e962312574871f2f0 (patch)
tree2e47728fb7a87a4caeb1ee325db40d6cfb360116 /mod
parentf6f151433c7ecdbfc1bf443880eb63841c61eb7e (diff)
downloadvolse-hubzilla-0c24784f5e92e0c8269f255e962312574871f2f0.tar.gz
volse-hubzilla-0c24784f5e92e0c8269f255e962312574871f2f0.tar.bz2
volse-hubzilla-0c24784f5e92e0c8269f255e962312574871f2f0.zip
include diaspora mentions in personal (requires adding a Diaspora profile url because they don't use ours)
Diffstat (limited to 'mod')
-rw-r--r--mod/network.php6
-rw-r--r--mod/notifications.php6
2 files changed, 8 insertions, 4 deletions
diff --git a/mod/network.php b/mod/network.php
index 8df3f83df..2a3db597e 100644
--- a/mod/network.php
+++ b/mod/network.php
@@ -373,9 +373,11 @@ function network_content(&$a, $update = 0) {
$myurl = $a->get_baseurl() . '/profile/'. $a->user['nickname'];
$myurl = substr($myurl,strpos($myurl,'://')+3);
$myurl = str_replace(array('www.','.'),array('','\\.'),$myurl);
- $sql_extra .= sprintf(" AND `item`.`parent` IN (SELECT distinct(`parent`) from item where ( `author-link` regexp '%s' or `tag` regexp '%s' )) ",
+ $diasp_url = str_replace('/profile/','/u/',$myurl);
+ $sql_extra .= sprintf(" AND `item`.`parent` IN (SELECT distinct(`parent`) from item where ( `author-link` regexp '%s' or `tag` regexp '%s' or tag regexp '%s' )) ",
dbesc($myurl . '$'),
- dbesc($myurl . '\\]')
+ dbesc($myurl . '\\]'),
+ dbesc($diasp_url . '\\]')
);
}
diff --git a/mod/notifications.php b/mod/notifications.php
index 385f9d719..5733e6e57 100644
--- a/mod/notifications.php
+++ b/mod/notifications.php
@@ -297,9 +297,11 @@ function notifications_content(&$a) {
$myurl = $a->get_baseurl() . '/profile/'. $a->user['nickname'];
$myurl = substr($myurl,strpos($myurl,'://')+3);
$myurl = str_replace(array('www.','.'),array('','\\.'),$myurl);
- $sql_extra .= sprintf(" AND ( `item`.`author-link` regexp '%s' or `item`.`tag` regexp '%s' ) ",
+ $diasp_url = str_replace('/profile/','/u/',$myurl);
+ $sql_extra .= sprintf(" AND ( `item`.`author-link` regexp '%s' or `item`.`tag` regexp '%s' or `item`.`tag` regexp '%s' ) ",
dbesc($myurl . '$'),
- dbesc($myurl . '\\]')
+ dbesc($myurl . '\\]'),
+ dbesc($diasp_url . '\\]')
);