diff options
| author | Andrew Manning <tamanning@zoho.com> | 2018-02-28 20:47:14 -0500 |
|---|---|---|
| committer | Andrew Manning <tamanning@zoho.com> | 2018-02-28 20:47:14 -0500 |
| commit | 39fe80a196ee626dda15b5b844dd1d05893f7646 (patch) | |
| tree | 1c66efd9cb61c2f18c0d98d57b1589de6164101e /Zotlabs/Module | |
| parent | 1035c453ea6468de13db8eb04fbb55d38347ff2a (diff) | |
| parent | 029d155a07e4d2a0af82a19d3234cee50b57a085 (diff) | |
| download | volse-hubzilla-39fe80a196ee626dda15b5b844dd1d05893f7646.tar.gz volse-hubzilla-39fe80a196ee626dda15b5b844dd1d05893f7646.tar.bz2 volse-hubzilla-39fe80a196ee626dda15b5b844dd1d05893f7646.zip | |
Merge branch 'dev' into oauth2
Diffstat (limited to 'Zotlabs/Module')
| -rw-r--r-- | Zotlabs/Module/Admin/Site.php | 3 | ||||
| -rw-r--r-- | Zotlabs/Module/Settings/Featured.php | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/Zotlabs/Module/Admin/Site.php b/Zotlabs/Module/Admin/Site.php index b7c558ce7..880dbbe4b 100644 --- a/Zotlabs/Module/Admin/Site.php +++ b/Zotlabs/Module/Admin/Site.php @@ -220,9 +220,10 @@ class Site { $realm = get_directory_realm(); // directory server should not be set or settable unless we are a directory client + // avoid older redmatrix servers which don't have modern encryption if($dirmode == DIRECTORY_MODE_NORMAL) { - $x = q("select site_url from site where site_flags in (%d,%d) and site_realm = '%s' and site_dead = 0", + $x = q("select site_url from site where site_flags in (%d,%d) and site_realm = '%s' and site_dead = 0 and site_project != 'redmatrix'", intval(DIRECTORY_MODE_SECONDARY), intval(DIRECTORY_MODE_PRIMARY), dbesc($realm) diff --git a/Zotlabs/Module/Settings/Featured.php b/Zotlabs/Module/Settings/Featured.php index 9c5a7b16c..1da139206 100644 --- a/Zotlabs/Module/Settings/Featured.php +++ b/Zotlabs/Module/Settings/Featured.php @@ -61,7 +61,8 @@ class Featured { $tpl = get_markup_template("settings_addons.tpl"); $o .= replace_macros($tpl, array( '$form_security_token' => get_form_security_token("settings_featured"), - '$title' => t('Feature/Addon Settings'), + '$title' => t('Addon Settings'), + '$descrip' => t('Please save/submit changes to any panel before opening another.'), '$settings_addons' => $settings_addons )); return $o; |