diff options
| author | Mario Vavti <mario@mariovavti.com> | 2018-05-19 08:45:41 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2018-05-19 08:45:41 +0200 |
| commit | 1ca6ef0f60da9fcfd3e640d0ff43af5fc033eac5 (patch) | |
| tree | 7a0bf98c9a81193e66d8579cee2afa15c9889dcb /Zotlabs/Module/Admin/Site.php | |
| parent | 056f3d352cb8855c0845bebc459973ddcb4c0b2f (diff) | |
| parent | dae89ce91c65679003d10da113a45f3ff37a8d39 (diff) | |
| download | volse-hubzilla-1ca6ef0f60da9fcfd3e640d0ff43af5fc033eac5.tar.gz volse-hubzilla-1ca6ef0f60da9fcfd3e640d0ff43af5fc033eac5.tar.bz2 volse-hubzilla-1ca6ef0f60da9fcfd3e640d0ff43af5fc033eac5.zip | |
Merge remote-tracking branch 'mike/master' into dev
Diffstat (limited to 'Zotlabs/Module/Admin/Site.php')
| -rw-r--r-- | Zotlabs/Module/Admin/Site.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Zotlabs/Module/Admin/Site.php b/Zotlabs/Module/Admin/Site.php index ff4f56ac8..292de4c3a 100644 --- a/Zotlabs/Module/Admin/Site.php +++ b/Zotlabs/Module/Admin/Site.php @@ -344,8 +344,8 @@ class Site { '$disable_discover_tab' => array('disable_discover_tab', t('Import Public Streams'), $discover_tab, t('Import and allow access to public content pulled from other sites. Warning: this content is unmoderated.')), '$site_firehose' => array('site_firehose', t('Site only Public Streams'), get_config('system','site_firehose'), t('Allow access to public content originating only from this site if Imported Public Streams are disabled.')), '$open_pubstream' => array('open_pubstream', t('Allow anybody on the internet to access the Public streams'), get_config('system','open_pubstream',1), t('Disable to require authentication before viewing. Warning: this content is unmoderated.')), - '$incl' => array('pub_incl',t('Only import Public stream posts with this text'), $contact['abook_incl'],t('words one per line or #tags or /patterns/ or lang=xx, leave blank to import all posts')), - '$excl' => array('pub_excl',t('Do not import Public stream posts with this text'), $contact['abook_excl'],t('words one per line or #tags or /patterns/ or lang=xx, leave blank to import all posts')), + '$incl' => array('pub_incl',t('Only import Public stream posts with this text'), get_config('system','pubstream_incl'),t('words one per line or #tags or /patterns/ or lang=xx, leave blank to import all posts')), + '$excl' => array('pub_excl',t('Do not import Public stream posts with this text'), get_config('system','pubstream_excl'),t('words one per line or #tags or /patterns/ or lang=xx, leave blank to import all posts')), '$login_on_homepage' => array('login_on_homepage', t("Login on Homepage"),((intval($homelogin) || $homelogin === false) ? 1 : '') , t("Present a login box to visitors on the home page if no other content has been configured.")), |