Merge pull request #965 from annando/master

Only show connectors when not "hide wall" is enabled

diff --git a/include/conversation.php b/include/conversation.php
index 8e868afec70db2369613c553f0c31ed6c92ed2c3..ddb01ec9b8a3e3a63e88bc71db9960bfaaac0fc2 100644 (file)
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -1043,13 +1043,18 @@ function status_editor($a,$x, $notes_cid = 0, $popup=false) {
                }
        }
 
-       if($mail_enabled) {
-               $selected = (($pubmail_enabled) ? ' checked="checked" ' : '');
-               $jotnets .= '<div class="profile-jot-net"><input type="checkbox" name="pubmail_enable"' . $selected . ' value="1" /> ' . t("Post to Email") . '</div>';
-       }
+       if (!$a->user['hidewall']) {
+               if($mail_enabled) {
+                       $selected = (($pubmail_enabled) ? ' checked="checked" ' : '');
+                       $jotnets .= '<div class="profile-jot-net"><input type="checkbox" name="pubmail_enable"' . $selected . ' value="1" /> ' . t("Post to Email") . '</div>';
+               }
+
+               call_hooks('jot_networks', $jotnets);
+       } else
+               $jotnets .= sprintf(t('Connectors disabled, since "%s" is enabled.'),
+                                   t('Hide your profile details from unknown viewers?'));
 
        call_hooks('jot_tool', $jotplugins);
-       call_hooks('jot_networks', $jotnets);
 
        if($notes_cid)
                $jotnets .= '<input type="hidden" name="contact_allow[]" value="' . $notes_cid .'" />';

diff --git a/mod/install.php b/mod/install.php
index b92856690eaa8bf59fad47f34679530085e9c52c..4be728f267653f8b909f843fad93a4a26556e6e9 100755 (executable)
--- a/mod/install.php
+++ b/mod/install.php
@@ -504,7 +504,7 @@ function load_database($db) {
        foreach($arr as $a) {
                if(strlen(trim($a))) {  
                        $r = @$db->q(trim($a));
-                       if(! $r) {
+                       if(false === $r) {
                                $errors .=  t('Errors encountered creating database tables.') . $a . EOL;
                        }
                }