Merge branch '1.0.x' of gitorious.org:statusnet/mainline into inline-comments

[quix0rs-gnu-social.git] / actions / logout.php

diff --git a/actions/logout.php b/actions/logout.php
index 6e147ccc05bdb1477818d6b08d5f9e05f51097a4..f747371225587a4b85099b6677bc8879e9c97556 100644 (file)
--- a/actions/logout.php
+++ b/actions/logout.php
@@ -28,12 +28,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
-require_once INSTALLDIR.'/lib/openid.php';
-
 /**
  * Logout action class.
  *
@@ -68,6 +66,7 @@ class LogoutAction extends Action
     {
         parent::handle($args);
         if (!common_logged_in()) {
+            // TRANS: Client error displayed trying to log out when not logged in.
             $this->clientError(_('Not logged in.'));
         } else {
             if (Event::handle('StartLogout', array($this))) {
@@ -85,5 +84,4 @@ class LogoutAction extends Action
         common_real_login(false); // not logged in
         common_forgetme(); // don't log back in!
     }
-
 }