diff options
author | redmatrix <git@macgirvin.com> | 2016-01-17 16:51:06 -0800 |
---|---|---|
committer | redmatrix <git@macgirvin.com> | 2016-01-17 16:51:06 -0800 |
commit | 3b18c82c889e913785ef7c682f1d8af73fcd5a8d (patch) | |
tree | 987ac0180c3189fdce8d52bf3a020b0e58bf6791 /mod/admin.php | |
parent | be83855acf2db7f4f55d4cb30878c67d53ca69b6 (diff) | |
parent | 819a331c4a9e604673e824631f2afe52ece3381b (diff) | |
download | volse-hubzilla-3b18c82c889e913785ef7c682f1d8af73fcd5a8d.tar.gz volse-hubzilla-3b18c82c889e913785ef7c682f1d8af73fcd5a8d.tar.bz2 volse-hubzilla-3b18c82c889e913785ef7c682f1d8af73fcd5a8d.zip |
Merge https://github.com/redmatrix/hubzilla into pending_merge
Diffstat (limited to 'mod/admin.php')
-rw-r--r-- | mod/admin.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mod/admin.php b/mod/admin.php index 2d859399b..b537992d7 100644 --- a/mod/admin.php +++ b/mod/admin.php @@ -492,7 +492,7 @@ function admin_page_site(&$a) { '$delivery_batch_count' => array('delivery_batch_count', t('Deliveries per process'),(x(get_config('system','delivery_batch_count'))?get_config('system','delivery_batch_count'):1), t("Number of deliveries to attempt in a single operating system process. Adjust if necessary to tune system performance. Recommend: 1-5.")), '$poll_interval' => array('poll_interval', t("Poll interval"), (x(get_config('system','poll_interval'))?get_config('system','poll_interval'):2), t("Delay background polling processes by this many seconds to reduce system load. If 0, use delivery interval.")), '$maxloadavg' => array('maxloadavg', t("Maximum Load Average"), ((intval(get_config('system','maxloadavg')) > 0)?get_config('system','maxloadavg'):50), t("Maximum system load before delivery and poll processes are deferred - default 50.")), - '$default_expire_days' => array('default_expire_days', t('Expiration period in days for imported (matrix/network) content'), intval(get_config('system','default_expire_days')), t('0 for no expiration of imported content')), + '$default_expire_days' => array('default_expire_days', t('Expiration period in days for imported (grid/network) content'), intval(get_config('system','default_expire_days')), t('0 for no expiration of imported content')), '$form_security_token' => get_form_security_token("admin_site"), )); } |