aboutsummaryrefslogtreecommitdiffstats
path: root/mod
diff options
context:
space:
mode:
Diffstat (limited to 'mod')
-rw-r--r--mod/network.php3
-rw-r--r--mod/photos.php3
-rw-r--r--mod/search.php3
3 files changed, 8 insertions, 1 deletions
diff --git a/mod/network.php b/mod/network.php
index 6e1148b90..a9d5d0a6a 100644
--- a/mod/network.php
+++ b/mod/network.php
@@ -121,6 +121,9 @@ EOT;
function saved_searches($search) {
+ if(! feature_enabled(local_user(),'savedsearch'))
+ return '';
+
$a = get_app();
$srchurl = '/network?f='
diff --git a/mod/photos.php b/mod/photos.php
index ee9691e34..c98655df3 100644
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -618,7 +618,8 @@ function photos_post(&$a) {
$arr['tag'] = $tagged[4];
$arr['inform'] = $tagged[2];
$arr['origin'] = 1;
- $arr['body'] = '[url=' . $tagged[1] . ']' . $tagged[0] . '[/url]' . ' ' . t('was tagged in a') . ' ' . '[url=' . $a->get_baseurl() . '/photos/' . $owner_record['nickname'] . '/image/' . $p[0]['resource_id'] . ']' . t('photo') . '[/url]' . ' ' . t('by') . ' ' . '[url=' . $owner_record['url'] . ']' . $owner_record['name'] . '[/url]' ;
+ $arr['body'] = sprintf( t('%1$s was tagged in %2$s by %3$s'), '[url=' . $tagged[1] . ']' . $tagged[0] . '[/url]', '[url=' . $a->get_baseurl() . '/photos/' . $owner_record['nickname'] . '/image/' . $p[0]['resource-id'] . ']' . t('a photo') . '[/url]', '[url=' . $owner_record['url'] . ']' . $owner_record['name'] . '[/url]') ;
+
$arr['body'] .= "\n\n" . '[url=' . $a->get_baseurl() . '/photos/' . $owner_record['nickname'] . '/image/' . $p[0]['resource_id'] . ']' . '[img]' . $a->get_baseurl() . "/photo/" . $p[0]['resource_id'] . '-' . $best . '.' . $ext . '[/img][/url]' . "\n" ;
$arr['object'] = '<object><type>' . ACTIVITY_OBJ_PERSON . '</type><title>' . $tagged[0] . '</title><id>' . $tagged[1] . '/' . $tagged[0] . '</id>';
diff --git a/mod/search.php b/mod/search.php
index 048ed80e1..3f34587ef 100644
--- a/mod/search.php
+++ b/mod/search.php
@@ -2,6 +2,9 @@
function search_saved_searches() {
+ if(! feature_enabled(local_user(),'savedsearch'))
+ return '';
+
$o = '';
$r = q("select `tid`,`term` from `term` WHERE `uid` = %d and type = %d",