remove more wiki code, fix redirect if there is a trailing /

git-svn-id: svn+ssh://murphy/home/svn/platal/trunk@549 839d8a87-29fc-0310-9880-83ba4fa771e5

diff --git a/hooks/wiki.inc.php b/hooks/wiki.inc.php
deleted file mode 100644 (file)
index b131f24..0000000
--- a/hooks/wiki.inc.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-/***************************************************************************
- *  Copyright (C) 2003-2006 Polytechnique.org                              *
- *  http://opensource.polytechnique.org/                                   *
- *                                                                         *
- *  This program is free software; you can redistribute it and/or modify   *
- *  it under the terms of the GNU General Public License as published by   *
- *  the Free Software Foundation; either version 2 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 General Public License for more details.                           *
- *                                                                         *
- *  You should have received a copy of the GNU General Public License      *
- *  along with this program; if not, write to the Free Software            *
- *  Foundation, Inc.,                                                      *
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
- ***************************************************************************/
-
-// {{{ config HOOK
-
-// {{{ class WikiConfig
-
-class WikiConfig
-{
-    var $mwiki_enable   = true;
-    var $wikidir       = "";
-    var $workdir        = "wiki.d";
-}
-
-// }}}
-
-function wiki_config()
-{
-    global $globals;
-    $globals->wiki = new WikiConfig;
-}
-
-// }}}
-
-?>

diff --git a/include/wiki.inc.php b/include/wiki.inc.php
index dbb7810..7485093 100644 (file)
--- a/include/wiki.inc.php
+++ b/include/wiki.inc.php
@@ -24,7 +24,7 @@ function wiki_pagename() {
         return null;
     }
 
-    $words = explode('/', Env::get('n'));
+    $words = explode('/', trim(Env::get('n'), '/'));
     if (count($words) == 2) {
         return join('.', $words);
     }