From: Zach Copley <zach@controlyourself.ca>
Date: Tue, 30 Jun 2009 23:10:12 +0000 (-0700)
Subject: Merge commit 'jeff-themovie/invite-enabled' into 0.8.x
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=b10dba27982a94d73fb7f8d70cae611241871706;p=quix0rs-gnu-social.git

Merge commit 'jeff-themovie/invite-enabled' into 0.8.x

* commit 'jeff-themovie/invite-enabled':
  Adds $config['invite']['enabled'] to enable/disable invites.
---

b10dba27982a94d73fb7f8d70cae611241871706
diff --cc plugins/FBConnect/FBConnectPlugin.php
index cd6e9cecfb,11dc568a9a..d45d2718c3
--- a/plugins/FBConnect/FBConnectPlugin.php
+++ b/plugins/FBConnect/FBConnectPlugin.php
@@@ -273,14 -200,16 +273,16 @@@ class FBConnectPlugin extends Plugi
               $action->menuItem(common_local_url('smssettings'),
                   _('Connect'), _('Connect to SMS, Twitter'), false, 'nav_connect');
              }
-             $action->menuItem(common_local_url('invite'),
-                 _('Invite'),
-                 sprintf(_('Invite friends and colleagues to join you on %s'),
-                 common_config('site', 'name')),
-                 false, 'nav_invitecontact');
+             if (common_config('invite', 'enabled')) {
+                 $action->menuItem(common_local_url('invite'),
+                     _('Invite'),
+                     sprintf(_('Invite friends and colleagues to join you on %s'),
+                     common_config('site', 'name')),
+                     false, 'nav_invitecontact');
+             }
  
              // Need to override the Logout link to make it do FB stuff
 -            if ($flink && $fbuid > 0) {
 +            if (!empty($fbuid)) {
  
                  $logout_url = common_local_url('logout');
                  $title =  _('Logout from the site');