diff options
| author | Max Kremmel <xing@synapse.plus.com> | 2006-01-10 21:14:10 +0000 |
|---|---|---|
| committer | Max Kremmel <xing@synapse.plus.com> | 2006-01-10 21:14:10 +0000 |
| commit | b72268f4a8084962bab3a65a05079ee174107c70 (patch) | |
| tree | b36ac522fa98356f1c13d18226d88c1ae1dde4b3 /plugins | |
| parent | 23d5dcf7f24189993a907e00db4c83cb56af1b92 (diff) | |
| download | nexus-b72268f4a8084962bab3a65a05079ee174107c70.tar.gz nexus-b72268f4a8084962bab3a65a05079ee174107c70.tar.bz2 nexus-b72268f4a8084962bab3a65a05079ee174107c70.zip | |
merge recent changes into HEAD
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/menu.formelements.php | 4 | ||||
| -rw-r--r-- | plugins/menu.suckerfish.php | 4 | ||||
| -rw-r--r-- | plugins/menu.tikiwiki.php | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/plugins/menu.formelements.php b/plugins/menu.formelements.php index c23b6e5..a43c9b9 100644 --- a/plugins/menu.formelements.php +++ b/plugins/menu.formelements.php @@ -6,7 +6,7 @@ * @abstract implements javascript menu using form elements * @author william@elan.net * copied copied from menu.suckerfish.php originally by xing - * @version $Revision: 1.3 $ + * @version $Revision: 1.4 $ * @package nexus * @subpackage plugins */ @@ -46,7 +46,7 @@ function writeFormMenuCache( $pMenuHash ) { global $gBitSmarty; $menu_name = preg_replace( "/ +/", "_", trim( $pMenuHash->mInfo['title'] ) ); $menu_name = strtolower( $menu_name ); - $menu_file = 'mod_'.$menu_name.'_'.$pMenuHash->mInfo['menu_id'].'.tpl'; + $menu_file = $pMenuHash->mInfo['cache']['file']; if ( $pMenuHash->mInfo['type'] != 'qdd' ) { $data = '{bitmodule title="{tr}'.$pMenuHash->mInfo['title'].'{/tr}" name="'.$menu_name.'"}'; } diff --git a/plugins/menu.suckerfish.php b/plugins/menu.suckerfish.php index f501bfa..183e4d5 100644 --- a/plugins/menu.suckerfish.php +++ b/plugins/menu.suckerfish.php @@ -5,7 +5,7 @@ * * @abstract creates a simple <ul> and <li> based list of items * @author xing@synapse.plus.com - * @version $Revision: 1.5 $ + * @version $Revision: 1.6 $ * @package nexus * @subpackage plugins */ @@ -45,7 +45,7 @@ function writeSuckerfishCache( $pMenuHash ) { $menu_name = strtolower( $menu_name ); if( $pMenuHash->mInfo['type'] != 'hor' ) { - $menu_file = 'mod_'.$menu_name.'_'.$pMenuHash->mInfo['menu_id'].'.tpl'; + $menu_file = $pMenuHash->mInfo['cache']['file']; $data = '{bitmodule title="{tr}'.$pMenuHash->mInfo['title'].'{/tr}" name="'.$menu_name.'"}'; $data .= '<div class="suckerfish">'; } else { diff --git a/plugins/menu.tikiwiki.php b/plugins/menu.tikiwiki.php index 6de2f4e..c464ad5 100644 --- a/plugins/menu.tikiwiki.php +++ b/plugins/menu.tikiwiki.php @@ -4,7 +4,7 @@ * * @abstract creates a javascript expandable menu * @author xing@synapse.plus.com - * @version $Revision: 1.4 $ + * @version $Revision: 1.5 $ * @package nexus * @subpackage plugins */ @@ -45,7 +45,7 @@ function writeTikiWikiCache( $pMenuHash ) { global $gBitSmarty; $menu_name = preg_replace( "/ +/", "_", trim( $pMenuHash->mInfo['title'] ) ); $menu_name = strtolower( $menu_name ); - $menu_file = 'mod_'.$menu_name.'_'.$pMenuHash->mInfo['menu_id'].'.tpl'; + $menu_file = $pMenuHash->mInfo['cache']['file']; $data = '{bitmodule title="{tr}'.$pMenuHash->mInfo['title'].'{/tr}" name="'.$menu_name.'"}'; $data .= '<div class="tikiwiki menu">'; // if a permission has been set, we need to work out when to close the {if} clause |