|
From: Jon O. <jon...@us...> - 2006-08-26 20:36:50
|
Update of /cvsroot/mxbb/mx_phpbb/includes In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv26346/modules/mx_phpbb/includes Modified Files: forum_hack.php Log Message: A couple of fixes when phpBB is ran with a subselection of forums. Index: forum_hack.php =================================================================== RCS file: /cvsroot/mxbb/mx_phpbb/includes/forum_hack.php,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** forum_hack.php 16 Aug 2006 20:01:43 -0000 1.14 --- forum_hack.php 26 Aug 2006 20:36:45 -0000 1.15 *************** *** 14,17 **** --- 14,22 ---- } + if ($_GET['mode'] == 'topicreview') + { + return; + } + define( 'MX_FORUM_DEBUG', 1 ); *************** *** 1292,1296 **** // NOTE: This regex will only work if "global" is stated on a new line... // ! $code = preg_replace('#^(.?).*(global)(.*?)($)(.*?)(\r\n?|\n)#m', '// mxBB rewrite of global, to instance $this in this function' . "\n " . 'global $mx_forum, \\3', $code); // --- 1297,1301 ---- // NOTE: This regex will only work if "global" is stated on a new line... // ! $code = preg_replace('#^(.?).*(global)(.*?)($)(.*?)(\r\n?|\n)#m', '// mxBB rewrite of global, to instance $this in this function' . "\n " . 'global $mx_forum, \\3', $code); // *************** *** 1302,1306 **** { case 'index': ! $code = str_replace('$display_forums = true;', '$display_forums = $mx_forum->phpbb2_auth_cat($forum_data[$j][\'forum_id\']);', $code); break; --- 1307,1313 ---- { case 'index': ! //$code = str_replace('$display_forums = true;', '$display_forums = $mx_forum->phpbb2_auth_cat($forum_data[$j][\'forum_id\']);', $code); // For old phpBB versions ! $code = str_replace('$is_auth_ary[$forum_data[$i][\'forum_id\']][\'auth_view\']', '$is_auth_ary[$forum_data[$i][\'forum_id\']][\'auth_view\'] && $mx_forum->phpbb2_auth_cat($forum_data[$i][\'forum_id\'])', $code); // For phpBB 2.0.21 and later ! $code = str_replace('$is_auth_ary[$forum_id][\'auth_view\']', '$is_auth_ary[$forum_id][\'auth_view\'] && $mx_forum->phpbb2_auth_cat($forum_data[$i][\'forum_id\'])', $code); // For phpBB 2.0.21 and later break; |