turn off some "advanced" features by default, like archives and saved search - even though we don't yet have a screen to turn them on. That will come.

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=' 

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>';

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",