From: Evan Prodromou <evan@controlyourself.ca>
Date: Wed, 1 Jul 2009 16:58:49 +0000 (-0400)
Subject: Merge branch '0.8.x' of git@gitorious.org:+laconica-developers/laconica/dev into... 
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=721ba6c88f3c89c3efcc8e5f0c9169d94911825d;hp=-c;p=quix0rs-gnu-social.git

Merge branch '0.8.x' of git@gitorious.org:+laconica-developers/laconica/dev into 0.8.x
---

721ba6c88f3c89c3efcc8e5f0c9169d94911825d
diff --combined lib/action.php
index 6a2f9b0f19,12d122f120..3bfa6ba15b
--- a/lib/action.php
+++ b/lib/action.php
@@@ -247,6 -247,7 +247,6 @@@ class Action extends HTMLOutputter // l
                                                 'src' => common_path('js/jquery.joverlay.min.js')),
                                 ' ');
  
 -
                  Event::handle('EndShowJQueryScripts', array($this));
              }
              if (Event::handle('StartShowLaconicaScripts', array($this))) {
@@@ -421,11 -422,13 +421,13 @@@
                      $this->menuItem(common_local_url('smssettings'),
                                      _('Connect'), _('Connect to SMS, Twitter'), false, 'nav_connect');
                  }
-                 $this->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')) {
+                     $this->menuItem(common_local_url('invite'),
+                                     _('Invite'),
+                                     sprintf(_('Invite friends and colleagues to join you on %s'),
+                                             common_config('site', 'name')),
+                                     false, 'nav_invitecontact');
+                 }
                  $this->menuItem(common_local_url('logout'),
                                  _('Logout'), _('Logout from the site'), false, 'nav_logout');
              }
@@@ -963,16 -966,12 +965,16 @@@
          $action = $this->trimmed('action');
          $args   = $this->args;
          unset($args['action']);
 +        if (common_config('site', 'fancy')) {
 +            unset($args['p']);
 +        }
          if (array_key_exists('submit', $args)) {
              unset($args['submit']);
          }
          foreach (array_keys($_COOKIE) as $cookie) {
              unset($args[$cookie]);
          }
 +
          return common_local_url($action, $args);
      }
  
diff --combined lib/util.php
index 203506bbc0,2721045819..461ca15c15
--- a/lib/util.php
+++ b/lib/util.php
@@@ -114,7 -114,7 +114,7 @@@ function common_check_user($nickname, $
          return false;
      }
      $user = User::staticGet('nickname', $nickname);
-     if (is_null($user)) {
+     if (is_null($user) || $user === false) {
          return false;
      } else {
          if (0 == strcmp(common_munge_password($password, $user->id),
@@@ -145,6 -145,7 +145,6 @@@ function common_ensure_session(
      }
      if (!common_have_session()) {
          if (common_config('sessions', 'handle')) {
 -            common_log(LOG_INFO, "Using our own session handler");
              Session::setSaveHandler();
          }
          @session_start();