[mxbb-commits] mx_smartor/album_mod/includes album_integration.php, 1.6, 1.7

[FlorinCB <ory...@us...>]

Update of /cvsroot/mxbb/mx_smartor/album_mod/includes
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv13966

Modified Files:
	album_integration.php 
Log Message:
fix

Index: album_integration.php
===================================================================
RCS file: /cvsroot/mxbb/mx_smartor/album_mod/includes/album_integration.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** album_integration.php	1 Sep 2008 01:11:49 -0000	1.6
--- album_integration.php	5 Sep 2008 22:56:59 -0000	1.7
***************
*** 50,54 ****
  	function this_smartor_mxurl($args = '', $force_standalone_mode = false, $new_pageid = '')
  	{
! 		global $mx_root_path, $phpbb_root_path, $module_root_path, $mx_request_vars;
  		global $album_index, $phpEx, $integration_enabled, $is_block, $mx_mod_rewrite;
  
--- 50,54 ----
  	function this_smartor_mxurl($args = '', $force_standalone_mode = false, $new_pageid = '')
  	{
! 		global $mx_root_path, $phpbb_root_path, $module_root_path, $mx_request_vars, $page_id;
  		global $album_index, $phpEx, $integration_enabled, $is_block, $mx_mod_rewrite;
  
***************
*** 65,69 ****
  		}
  		
! 		$pageid = ($new_pageid) ? intval($new_pageid) : $mx_request_vars->request('page', MX_TYPE_INT, 1);
  
  		$args .= ($args == '' ? '' : '&' ) . 'modrewrite=no';
--- 65,69 ----
  		}
  		
! 		$pageid = ($new_pageid) ? intval($new_pageid) : ($page_id && is_numeric($page_id)) ? intval($page_id) : $mx_request_vars->request('page', MX_TYPE_INT, 1);
  
  		$args .= ($args == '' ? '' : '&' ) . 'modrewrite=no';
***************
*** 79,83 ****
  		{
  			$mxurl = $mx_root_path . 'index.' . $phpEx;
! 			if( is_numeric($page_id) && !empty($page_id) )
  			{
  				$mxurl .= '?page=' . $pageid . $dynamicId. ($args == '' ? '' : '&' . $args);
--- 79,83 ----
  		{
  			$mxurl = $mx_root_path . 'index.' . $phpEx;
! 			if( is_numeric($pageid) && !empty($pageid) )
  			{
  				$mxurl .= '?page=' . $pageid . $dynamicId. ($args == '' ? '' : '&' . $args);