[mxbb-commits] mx_music/music_box music_common.php,1.6,1.7

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

Update of /cvsroot/mxbb/mx_music/music_box
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv30464/music_box

Modified Files:
	music_common.php 
Log Message:


Index: music_common.php
===================================================================
RCS file: /cvsroot/mxbb/mx_music/music_box/music_common.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** music_common.php	29 Jan 2008 07:48:55 -0000	1.6
--- music_common.php	8 Mar 2008 20:54:50 -0000	1.7
***************
*** 28,35 ****
  include_once($music_root_path . 'includes/' . 'music_constants.'.$phpEx);
  
  // **********************************************************************
  //  Read language definition
  // **********************************************************************
- 
  if ( !MXBB_MODULE )
  {
--- 28,35 ----
  include_once($music_root_path . 'includes/' . 'music_constants.'.$phpEx);
  
+ /*
  // **********************************************************************
  //  Read language definition
  // **********************************************************************
  if ( !MXBB_MODULE )
  {
***************
*** 58,62 ****
  	} 
  }
! 
  // **********************************************************************
  //  Read theme definition and language in theme definition
--- 58,63 ----
  	} 
  }
! */
! /*
  // **********************************************************************
  //  Read theme definition and language in theme definition
***************
*** 69,73 ****
  	if ( !($result = $db->sql_query($sql)) )
  	{
! 		mx_message_die(CRITICAL_ERROR, 'Could not query database for theme info');
  	}
  
--- 70,74 ----
  	if ( !($result = $db->sql_query($sql)) )
  	{
! 		message_die(CRITICAL_ERROR, 'Could not query database for theme info');
  	}
  
***************
*** 89,93 ****
  			if ( !($result = $db->sql_query($sql)) )
  			{
! 				mx_message_die(CRITICAL_ERROR, 'Could not query database for theme info');
  			}
  
--- 90,94 ----
  			if ( !($result = $db->sql_query($sql)) )
  			{
! 				message_die(CRITICAL_ERROR, 'Could not query database for theme info');
  			}
  
***************
*** 99,108 ****
  			else
  			{
! 				mx_message_die(CRITICAL_ERROR, "Could not get theme data for themes_id [$style]");
  			}
  		}
  		else
  		{
! 			mx_message_die(CRITICAL_ERROR, "Could not get theme data for themes_id [$style]");
  		}
  	}
--- 100,109 ----
  			else
  			{
! 				message_die(CRITICAL_ERROR, "Could not get theme data for themes_id [$style]");
  			}
  		}
  		else
  		{
! 			message_die(CRITICAL_ERROR, "Could not get theme data for themes_id [$style]");
  		}
  	}
***************
*** 165,168 ****
--- 166,170 ----
  	}
  } 
+ */
  
  //
***************
*** 173,177 ****
  if(!$result = $db->sql_query($sql))
  {
! 	mx_message_die(GENERAL_ERROR, "Could not query music config information", "", __LINE__, __FILE__, $sql);
  }
  while( $row = $db->sql_fetchrow($result) )
--- 175,179 ----
  if(!$result = $db->sql_query($sql))
  {
! 	message_die(GENERAL_ERROR, "Could not query music config information", "", __LINE__, __FILE__, $sql);
  }
  while( $row = $db->sql_fetchrow($result) )
***************
*** 236,245 ****
  	'MUSIC_COPYRIGHT' => $music_module_copyright,
  	'L_INDEX' => '<<',
! 	'U_INDEX' => mx_append_sid($mx_root_path . "index.".$phpEx),
  	'L_MUSIC_INDEX' => $lang['Music'],
  	'L_MUSIC' => $lang['Music'],
! 	'U_MUSIC' => mx_append_sid(this_mo_mxurl()),
  	'L_SEARCH' => $lang['Search'],
! 	'U_MX_MUSIC' => mx_append_sid(this_mo_portalurl())
  	)
  );
--- 238,247 ----
  	'MUSIC_COPYRIGHT' => $music_module_copyright,
  	'L_INDEX' => '<<',
! 	'U_INDEX' => append_sid($mx_root_path . "index.".$phpEx),
  	'L_MUSIC_INDEX' => $lang['Music'],
  	'L_MUSIC' => $lang['Music'],
! 	'U_MUSIC' => append_sid(this_mo_mxurl()),
  	'L_SEARCH' => $lang['Search'],
! 	'U_MX_MUSIC' => append_sid(this_mo_portalurl())
  	)
  );