From: <sy...@us...> - 2007-04-02 17:21:53
|
Update of /cvsroot/tikiwiki/tiki/lib/phplayers_tiki In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv1236/lib/phplayers_tiki Modified Files: tiki-phplayers.php Log Message: Instant-Auto-Merge from BRANCH-1-9 to HEAD Index: tiki-phplayers.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/lib/phplayers_tiki/tiki-phplayers.php,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- tiki-phplayers.php 28 Mar 2007 14:58:45 -0000 1.16 +++ tiki-phplayers.php 2 Apr 2007 17:21:19 -0000 1.17 @@ -43,7 +43,8 @@ $res = ''; $curOption = 0; $url = urldecode($_SERVER['REQUEST_URI']); - include_once('lib/wiki/wikilib.php'); + global $wikilib; include_once('lib/wiki/wikilib.php'); + $url = str_replace('tiki-editpage.php', 'tiki-index.php', $url); $homePage = strtolower($wikilib->get_default_wiki_page()); if (preg_match('/.*tiki.index.php$/', $url)) { $url .= "?page=$homePage"; |