bug in userbyid

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

diff --git a/actions/logout.php b/actions/logout.php
index a40400e7ee614ded9703722928bc792146516f8a..3d52da0d655ae16c70beddd413e48b650788230a 100644 (file)
--- a/actions/logout.php
+++ b/actions/logout.php
@@ -1,4 +1,25 @@
 <?php
+/*
+ * Laconica - a distributed open-source microblogging tool
+ * Copyright (C) 2008, Controlez-Vous, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+if (!defined('LACONICA')) { exit(1); }
+
+require_once(INSTALLDIR.'/lib/openid.php');
 
 class LogoutAction extends Action {
        function handle($args) {
@@ -7,7 +28,9 @@ class LogoutAction extends Action {
                        common_user_error(_t('Not logged in.'));
                } else {
                        common_set_user(NULL);
-                       common_redirect(common_local_url('main'));
+                       common_real_login(false); # not logged in
+                       common_forgetme(); # don't log back in!
+                       common_redirect(common_local_url('public'));
                }
        }
 }