Version 4.3.6
This commit is contained in:
1 parent
fe1acf984a
commit
1a0c7fd3c2
609 files changed
+14707
-5726
No files matched your search
@@ -247,27 +247,34 @@ class Session
|
||||
catch( \UnderflowException $ex ) { }
|
||||
}
|
||||
|
||||
if ( $ipbVersion >= 40000 )
|
||||
if ( !SOURCE_CHARSET_OVERRIDE )
|
||||
{
|
||||
/* >= 4.0 is UTF-8 */
|
||||
$charSet = 'utf-8';
|
||||
}
|
||||
else if ( $ipbVersion !== null )
|
||||
{
|
||||
/* Attempt to grab current CHARSET if this is an IPB 3 */
|
||||
if ( \IPSUtf8\Db::i()->checkForTable('core_sys_conf_settings' ) )
|
||||
if ( $ipbVersion >= 40000 )
|
||||
{
|
||||
try
|
||||
{
|
||||
$row = \IPSUtf8\Db::i()->select( '*', 'core_sys_conf_settings', array( 'conf_key=?', 'gb_char_set' ) )->first();
|
||||
|
||||
if ( ! empty( $row['conf_key'] ) )
|
||||
{
|
||||
$charSet = ( $row['conf_value'] ) ? $row['conf_value'] : $row['conf_default'];
|
||||
}
|
||||
}
|
||||
catch( \UnderflowException $ex ) { }
|
||||
/* >= 4.0 is UTF-8 */
|
||||
$charSet = 'utf-8';
|
||||
}
|
||||
else if ( $ipbVersion !== null )
|
||||
{
|
||||
/* Attempt to grab current CHARSET if this is an IPB 3 */
|
||||
if ( \IPSUtf8\Db::i()->checkForTable('core_sys_conf_settings' ) )
|
||||
{
|
||||
try
|
||||
{
|
||||
$row = \IPSUtf8\Db::i()->select( '*', 'core_sys_conf_settings', array( 'conf_key=?', 'gb_char_set' ) )->first();
|
||||
|
||||
if ( ! empty( $row['conf_key'] ) )
|
||||
{
|
||||
$charSet = ( $row['conf_value'] ) ? $row['conf_value'] : $row['conf_default'];
|
||||
}
|
||||
}
|
||||
catch( \UnderflowException $ex ) { }
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
$charSet = strtolower( SOURCE_CHARSET_OVERRIDE );
|
||||
}
|
||||
|
||||
$tableData = $this->_getTables();
|
||||
|
||||
Reference in new issue
Block a user