diff -urN tikiwiki.orig/lib/smarty_tiki/function.phplayers.php tikiwiki/lib/smarty_tiki/function.phplayers.php --- tikiwiki.orig/lib/smarty_tiki/function.phplayers.php 2008-02-03 15:04:07.000000000 +0100 +++ tikiwiki/lib/smarty_tiki/function.phplayers.php 2008-02-03 15:04:07.000000000 +0100 @@ -58,8 +58,8 @@ $phplayers = new $class(); $phplayers->setDirrootCommon("/usr/share/php/libphp-phplayersmenu"); $phplayers->setLibjsdir("/usr/share/php/libphp-phplayersmenu/libjs/"); - $phplayers->setImgdir("/usr/share/php/libphp-phplayersmenu/images/"); - $phplayers->setImgwww("/usr/share/php/libphp-phplayersmenu/images/"); + $phplayers->setImgdir("/usr/share/php/libphp-phplayersmenu/menuimages/"); + $phplayers->setImgwww("/usr/share/php/libphp-phplayersmenu/menuimages/"); $phplayers->setTpldirCommon("/usr/share/php/libphp-phplayersmenu/templates/"); if (!empty($id)) { diff -urN tikiwiki.orig/setup_smarty.php tikiwiki/setup_smarty.php --- tikiwiki.orig/setup_smarty.php 2008-01-30 15:39:09.000000000 +0100 +++ tikiwiki/setup_smarty.php 2008-01-31 15:23:09.000000000 +0100 @@ -29,7 +29,8 @@ $this->caching = 0; $this->assign('app_name', 'TikiWiki'); $this->plugins_dir = array( // the directory order must be like this to overload a plugin - dirname(dirname(SMARTY_DIR))."/smarty_tiki", +# dirname(dirname(SMARTY_DIR))."/smarty_tiki", + '/usr/share/tikiwiki/lib/smarty_tiki', SMARTY_DIR."plugins" ); // we cannot use subdirs in safe mode diff -urN tikiwiki.orig/tiki-browse_categories.php tikiwiki/tiki-browse_categories.php --- tikiwiki.orig/tiki-browse_categories.php 2007-12-04 00:21:36.000000000 +0100 +++ tikiwiki/tiki-browse_categories.php 2008-01-31 21:19:19.000000000 +0100 @@ -126,8 +126,8 @@ $phplayers = new TreeMenu(); $phplayers->setDirrootCommon("/usr/share/php/libphp-phplayersmenu"); $phplayers->setLibjsdir("/usr/share/php/libphp-phplayersmenu/libjs/"); - $phplayers->setImgdir("/usr/share/php/libphp-phplayersmenu/images/"); - $phplayers->setImgwww("/usr/share/php/libphp-phplayersmenu/images/"); + $phplayers->setImgdir("/usr/share/php/libphp-phplayersmenu/menuimages/"); + $phplayers->setImgwww("/usr/share/php/libphp-phplayersmenu/menuimages/"); $phplayers->setTpldirCommon("/usr/share/php/libphp-phplayersmenu/templates/"); if ($itall) { $phplayers->setMenuStructureString($itall);