Menu
▾
▴
[mxbb-commits] core/includes mx_functions_core.php,1.123,1.124
|
From: Florin C B. <ory...@us...> - 2011-07-27 21:17:50
|
Update of /cvsroot/mxbb/core/includes
In directory vz-cvs-4.sog:/tmp/cvs-serv16133/includes
Modified Files:
mx_functions_core.php
Log Message:
Index: mx_functions_core.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/mx_functions_core.php,v
retrieving revision 1.123
retrieving revision 1.124
diff -C2 -d -r1.123 -r1.124
*** mx_functions_core.php 27 Jul 2011 19:44:58 -0000 1.123
--- mx_functions_core.php 27 Jul 2011 21:17:47 -0000 1.124
***************
*** 555,563 ****
while ( $row = $db->sql_fetchrow( $result ) )
{
$page_id = $row['page_id'];
$column_id = $row['column_id'];
! $next_page = ( $page_id != $row['page_id'] ) ? true : false;
! $next_column = ( $column_id != $row['column_id'] ) ? true : false;
!
$page_row = array(
"page_id" => $row['page_id'],
--- 555,563 ----
while ( $row = $db->sql_fetchrow( $result ) )
{
+ $next_page = ( $page_id != $row['page_id'] ) ? true : false;
+ $next_column = ( $column_id != $row['column_id'] ) ? true : false;
$page_id = $row['page_id'];
$column_id = $row['column_id'];
!
$page_row = array(
"page_id" => $row['page_id'],
***************
*** 635,639 ****
* @access private
*/
! function _update_cache()
{
global $db, $mx_root_path, $phpbb_root_path, $mx_use_cache, $portal_config;
--- 635,639 ----
* @access private
*/
! function _update_cache( )
{
global $db, $mx_root_path, $phpbb_root_path, $mx_use_cache, $portal_config;
***************
*** 645,649 ****
WHERE portal_id = 1";
! if ( !($result = $db->sql_query($sql)) )
{
mx_message_die( GENERAL_ERROR, "Could not update portal cache time.", "", __LINE__, __FILE__, $sql );
--- 645,649 ----
WHERE portal_id = 1";
! if ( !( $result = $db->sql_query( $sql, BEGIN_TRANSACTION ) ) )
{
mx_message_die( GENERAL_ERROR, "Could not update portal cache time.", "", __LINE__, __FILE__, $sql );
***************
*** 3034,3053 ****
FROM ' . PAGE_TABLE . '
ORDER BY page_parent, page_order ASC';
!
! $result = @$db->sql_query($sql);
!
//display an error debuging message only if the portal is installed/upgraded
! if(!$result && @!file_exists('install'))
{
mx_message_die(GENERAL_ERROR, 'Couldnt Query pages info', '', __LINE__, __FILE__, $sql);
}
! elseif(!$result && @file_exists('install'))
{
mx_message_die(GENERAL_ERROR, "Couldnt Query pages info"."<br />Please finish installin/upgrading the database. <br />".$lang['Please_remove_install_contrib'], "",__LINE__, __FILE__, $sql);
}
! $page_rowset = $db->sql_fetchrowset($result);
! $db->sql_freeresult($result);
!
for( $i = 0; $i < count( $page_rowset ); $i++ )
{
--- 3034,3052 ----
FROM ' . PAGE_TABLE . '
ORDER BY page_parent, page_order ASC';
!
//display an error debuging message only if the portal is installed/upgraded
! if(!@$db->sql_query($sql) && @!file_exists('install'))
{
mx_message_die(GENERAL_ERROR, 'Couldnt Query pages info', '', __LINE__, __FILE__, $sql);
}
! elseif(!@$db->sql_query($sql) && @file_exists('install'))
{
mx_message_die(GENERAL_ERROR, "Couldnt Query pages info"."<br />Please finish installin/upgrading the database. <br />".$lang['Please_remove_install_contrib'], "",__LINE__, __FILE__, $sql);
}
! $page_rowset = $db->sql_fetchrowset( $result );
!
! $db->sql_freeresult( $result );
!
for( $i = 0; $i < count( $page_rowset ); $i++ )
{
***************
*** 3286,3290 ****
function generate_jumpbox( $page_id = 0, $depth = 0, $default = '' )
{
! $page_list = '';
$pre = str_repeat( ' ', $depth );
--- 3285,3289 ----
function generate_jumpbox( $page_id = 0, $depth = 0, $default = '' )
{
! $page_list .= '';
$pre = str_repeat( ' ', $depth );
|