[mxbb-commits] mx_kb/kb/includes functions_kb.php, 1.24, 1.25 kb_constants.php, 1.12, 1.13

[Jon O. <jon...@us...>]

Update of /cvsroot/mxbb/mx_kb/kb/includes
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv12377/kb/includes

Modified Files:
	functions_kb.php kb_constants.php 
Log Message:
Mainly bugfixes, revealed during work with new project site
- Quick List blocks compatible with app mode
- The app mode has been rewritten somewhat, related to inline TOCs etc
- Print version link fixed

Index: functions_kb.php
===================================================================
RCS file: /cvsroot/mxbb/mx_kb/kb/includes/functions_kb.php,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** functions_kb.php	7 May 2008 20:07:38 -0000	1.24
--- functions_kb.php	21 May 2008 21:52:14 -0000	1.25
***************
*** 1023,1027 ****
  	function display_items( $start, $cat_id = false, $sort_options_list = false, $sql_xtra = '', $target_page_id = false )
  	{
! 		global $db, $kb_config, $template, $board_config;
  		global $images, $lang, $theme, $phpEx, $mx_kb_functions;
  		global $phpbb_root_path, $mx_root_path, $module_root_path, $is_block, $phpEx;
--- 1023,1027 ----
  	function display_items( $start, $cat_id = false, $sort_options_list = false, $sql_xtra = '', $target_page_id = false )
  	{
! 		global $db, $kb_config, $template, $board_config, $mx_block;
  		global $images, $lang, $theme, $phpEx, $mx_kb_functions;
  		global $phpbb_root_path, $mx_root_path, $module_root_path, $is_block, $phpEx;
***************
*** 1177,1181 ****
  
  			$article_title = $file_rowset[$i]['article_title'];
! 			$article_url = mx_append_sid( $this->this_mxurl( "mode=article&k=$article_id" ) );
  
  			// ===================================================
--- 1177,1185 ----
  
  			$article_title = $file_rowset[$i]['article_title'];
! 
! 			//
! 			// Article Url - Standard or App
! 			//
! 			$article_url = mx_append_sid( $this->this_mxurl( "mode=article&k=$article_id", false, false, $target_page_id ) );
  
  			// ===================================================

Index: kb_constants.php
===================================================================
RCS file: /cvsroot/mxbb/mx_kb/kb/includes/kb_constants.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** kb_constants.php	18 Feb 2008 21:02:57 -0000	1.12
--- kb_constants.php	21 May 2008 21:52:14 -0000	1.13
***************
*** 67,71 ****
  else
  {
! 	if (!$_GET['print']) // Do not "fix" with reuest wrapper!!
  	{
  		$mx_user->set_module_default_style('_core'); // For compatibility with core 2.8.x
--- 67,71 ----
  else
  {
! 	if (!$_GET['print']) // Do not "fix" with request wrapper!!
  	{
  		$mx_user->set_module_default_style('_core'); // For compatibility with core 2.8.x
***************
*** 81,85 ****
  		// - IMAGES: MX_IMAGES (default), MX_IMAGES_NONE
  		// -------------------------------------------------------------------------
! 		$mx_user->extend();
  
  		$mx_page->add_copyright( 'mxBB Knowledge Base Module' );
--- 81,88 ----
  		// - IMAGES: MX_IMAGES (default), MX_IMAGES_NONE
  		// -------------------------------------------------------------------------
! 		if (!$_GET['print']) // Do not "fix" with request wrapper!!
! 		{
! 			$mx_user->extend();
! 		}
  
  		$mx_page->add_copyright( 'mxBB Knowledge Base Module' );