From: Lawrence A. <la...@us...> - 2002-07-27 20:22:45
|
Update of /cvsroot/pn-modules/modules_development/phpWiki In directory usw-pr-cvs1:/tmp/cvs-serv2527/phpWiki Modified Files: index.php Log Message: Fixes for the pagehistory bug, default theme bug and XSS issue Index: index.php =================================================================== RCS file: /cvsroot/pn-modules/modules_development/phpWiki/index.php,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** index.php 9 Mar 2002 13:32:01 -0000 1.13 --- index.php 27 Jul 2002 20:22:42 -0000 1.14 *************** *** 21,25 **** $ModName = basename (dirname (__FILE__)); $scriptdir = dirname(__FILE__); ! ///////////////////////////////////////////////////////////////////// --- 21,26 ---- $ModName = basename (dirname (__FILE__)); $scriptdir = dirname(__FILE__); ! //patch from larsneo for pn 0.714 ! pnThemeLoad(pnUserGetTheme()); ///////////////////////////////////////////////////////////////////// *************** *** 362,369 **** // The themeinfo file can be used to override default settings above this line // (i.e. templates, logo, signature etc.) ! $theme=""; ! if ( !$theme == "" ) { ! if ( file_exists( "themes/$theme/themeinfo.php" ) ) { ! include "themes/$theme/themeinfo.php"; } } --- 363,371 ---- // The themeinfo file can be used to override default settings above this line // (i.e. templates, logo, signature etc.) ! // PN mod - namespace conflict with $theme, so changed to $wikitheme ! $wikitheme=""; ! if ( !$wikitheme == "" ) { ! if ( file_exists( "themes/$wikitheme/themeinfo.php" ) ) { ! include "themes/$wikitheme/themeinfo.php"; } } |