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.

7 files changed, 12 insertions, 5 deletions

diff --git a/boot.php b/boot.php
index 3958a0bac..7daab9247 100644
--- a/boot.php
+++ b/boot.php
@@ -11,6 +11,7 @@ require_once('include/cache.php');
 require_once('include/permissions.php');
 require_once('library/Mobile_Detect/Mobile_Detect.php');
 require_once('include/BaseObject.php');
+require_once('include/features.php');
 
 define ( 'FRIENDICA_PLATFORM',     'Friendica Red');
 define ( 'FRIENDICA_VERSION',      trim(file_get_contents('version.inc')) . 'R');
diff --git a/include/features.php b/include/features.php
index 61e4b2acd..d881461ef 100644
--- a/include/features.php
+++ b/include/features.php
@@ -23,6 +23,7 @@ $arr = array(
 'filing'         => t('Saved Folders'),
 'archives'       => t('Search by Date'),
 'dislike'        => t('Dislike Posts'),
+'savedsearch'    => t('Saved Searches'),
 
 );
 
diff --git a/include/items.php b/include/items.php
index c2bd69362..f640f1d2b 100755
--- a/include/items.php
+++ b/include/items.php
@@ -3796,9 +3796,7 @@ function posted_dates($uid,$wall) {
 function posted_date_widget($url,$uid,$wall) {
 	$o = '';
 
-	// For former Facebook folks that left because of "timeline"
-
-	if($wall && intval(get_pconfig($uid,'system','no_wall_archive_widget')))
+	if(! feature_enabled($uid,'archives'))
 		return $o;
 
 	$ret = posted_dates($uid,$wall);
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",
diff --git a/version.inc b/version.inc
index 951e4f480..6e327b8ef 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2012-11-02.126
+2012-11-03.127