diff options
| author | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2016-01-27 17:24:05 +0100 |
|---|---|---|
| committer | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2016-01-27 17:24:05 +0100 |
| commit | c766cf9565129b762998e709f5ee7c3eb14cffca (patch) | |
| tree | c462e39540d6f63e30d10aca1c64ffefcfa4d4ef /mod/settings.php | |
| parent | e4674142c6a205651d4bb207aa038e6d089da73f (diff) | |
| parent | 722d7ff38d5bbf49a7c990d9219998c2c8a5b58f (diff) | |
| download | volse-hubzilla-c766cf9565129b762998e709f5ee7c3eb14cffca.tar.gz volse-hubzilla-c766cf9565129b762998e709f5ee7c3eb14cffca.tar.bz2 volse-hubzilla-c766cf9565129b762998e709f5ee7c3eb14cffca.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'mod/settings.php')
| -rw-r--r-- | mod/settings.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/mod/settings.php b/mod/settings.php index d2ba590a2..c1a4b019d 100644 --- a/mod/settings.php +++ b/mod/settings.php @@ -354,7 +354,7 @@ function settings_post(&$a) { ); } else { - notice( sprintf('Default privacy collection \'%s\' not found. Please create and re-submit permission change.', t('Friends')) . EOL); + notice( sprintf('Default privacy group \'%s\' not found. Please create and re-submit permission change.', t('Friends')) . EOL); return; } } @@ -917,6 +917,7 @@ function settings_content(&$a) { $maxreq = $channel['channel_max_friend_req']; $expire = $channel['channel_expire_days']; $adult_flag = intval($channel['channel_pageflags'] & PAGE_ADULT); + $sys_expire = get_config('system','default_expire_days'); // $unkmail = $a->user['unkmail']; // $cntunkmail = $a->user['cntunkmail']; @@ -1050,7 +1051,7 @@ function settings_content(&$a) { '$lbl_p2macro' => t('Advanced Privacy Settings'), - '$expire' => array('expire',t('Expire other channel content after this many days'),$expire,t('0 or blank prevents expiration')), + '$expire' => array('expire',t('Expire other channel content after this many days'),$expire,sprintf( t('0 or blank to use the website limit. The website expires after %d days.'),intval($sys_expire))), '$maxreq' => array('maxreq', t('Maximum Friend Requests/Day:'), intval($channel['channel_max_friend_req']) , t('May reduce spam activity')), '$permissions' => t('Default Post Permissions'), '$permdesc' => t("\x28click to open/close\x29"), |