|
From: Jon O. <jon...@us...> - 2005-10-23 18:50:05
|
Update of /cvsroot/mxbb/mx_gallery2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21944/modules/mx_gallery2 Modified Files: gallery2.php gallery2_toplist.php Log Message: Updated all blocks to use the new $mx_block->get_parameters() api, instead of old red_block_config() function Index: gallery2.php =================================================================== RCS file: /cvsroot/mxbb/mx_gallery2/gallery2.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** gallery2.php 1 Oct 2005 14:13:00 -0000 1.3 --- gallery2.php 23 Oct 2005 18:49:57 -0000 1.4 *************** *** 24,33 **** } // ! // Read block settings ! // ! $block_config = read_block_config($block_id); ! $title = $block_config[$block_id]['block_title']; ! $xtra_gallery_get_pars = !empty($block_config[$block_id]['base_album']) ? '&g2_view=core.ShowItem&g2_itemId=' . intval($block_config[$block_id]['base_album']) : ''; // --- 24,31 ---- } + /// + // Read Block Settings // ! $title = $mx_block->block_info['block_title']; // Index: gallery2_toplist.php =================================================================== RCS file: /cvsroot/mxbb/mx_gallery2/gallery2_toplist.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** gallery2_toplist.php 12 Oct 2005 15:39:06 -0000 1.3 --- gallery2_toplist.php 23 Oct 2005 18:49:57 -0000 1.4 *************** *** 48,55 **** // ! // Read block settings // ! $block_config = read_block_config($block_id); ! $title = $block_config[$block_id]['block_title']; // --- 48,54 ---- // ! // Read Block Settings // ! $title = $mx_block->block_info['block_title']; // *************** *** 62,74 **** // Get vars // ! $g2_blocks = !empty($block_config[$block_id]['g2_blocks']['parameter_value']) ? $block_config[$block_id]['g2_blocks']['parameter_value'] : 'randomImage'; ! $g2_num_of_blocks = !empty($block_config[$block_id]['g2_num_of_blocks']['parameter_value']) ? $block_config[$block_id]['g2_num_of_blocks']['parameter_value'] : '1'; ! $g2_show = !empty($block_config[$block_id]['g2_show']['parameter_value']) ? unserialize($block_config[$block_id]['g2_show']['parameter_value']) : ''; ! $g2_subtreeId = !empty($block_config[$block_id]['g2_subtreeId']['parameter_value']) ? $block_config[$block_id]['g2_subtreeId']['parameter_value'] : ''; ! $g2_maxSize = !empty($block_config[$block_id]['g2_maxSize']['parameter_value']) ? intval($block_config[$block_id]['g2_maxSize']['parameter_value']) : ''; ! $g2_linkTarget = !empty($block_config[$block_id]['g2_linkTarget']['parameter_value']) ? $block_config[$block_id]['g2_linkTarget']['parameter_value'] : ''; ! $g2_itemFrame = !empty($block_config[$block_id]['g2_itemFrame']['parameter_value']) ? $block_config[$block_id]['g2_itemFrame']['parameter_value'] : ''; ! $g2_albumFrame = !empty($block_config[$block_id]['g2_albumFrame']['parameter_value']) ? $block_config[$block_id]['g2_albumFrame']['parameter_value'] : ''; ! $gallery_block_id = !empty($block_config[$block_id]['target_block']['parameter_value']) ? $block_config[$block_id]['target_block']['parameter_value'] : ''; $g2_page_id = get_page_id( $gallery_block_id ); --- 61,73 ---- // Get vars // ! $g2_blocks = $mx_block->get_parameters( 'g2_blocks' ); ! $g2_num_of_blocks = $mx_block->get_parameters( 'g2_num_of_blocks' ); ! $g2_show = unserialize($mx_block->get_parameters( 'g2_show' )); ! $g2_subtreeId = $mx_block->get_parameters( 'g2_subtreeId' ); ! $g2_maxSize = intval($mx_block->get_parameters( 'g2_maxSize' )); ! $g2_linkTarget = $mx_block->get_parameters( 'g2_linkTarget' ); ! $g2_itemFrame = $mx_block->get_parameters( 'g2_itemFrame' ); ! $g2_albumFrame = $mx_block->get_parameters( 'g2_albumFrame' ); ! $gallery_block_id = $mx_block->get_parameters( 'target_block' ); $g2_page_id = get_page_id( $gallery_block_id ); |