harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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.

Browse Source
This commit is contained in:
friendica 2012-11-03 16:40:05 -07:00
parent f5b1eee177
commit ece59b778e
7 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
boot.php
View File

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

1
include/features.php
View File

@ -23,6 +23,7 @@ $arr = array(
'filing' => t('Saved Folders'),
'archives' => t('Search by Date'),
'dislike' => t('Dislike Posts'),
'savedsearch' => t('Saved Searches'),
);

4
include/items.php
View File

@ -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);

3
mod/network.php
View File

@ -121,6 +121,9 @@ EOT;
function saved_searches($search) {
if(! feature_enabled(local_user(),'savedsearch'))
return '';
$a = get_app();
$srchurl = '/network?f='

3
mod/photos.php
View File

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

3
mod/search.php
View File

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

2
version.inc
View File

@ -1 +1 @@
2012-11-02.126
2012-11-03.127