Version 4.1.19

This commit is contained in:
Neo committed 2025-12-19 05:38:56 -08:00
1 parent 28bd025b35
commit 2bd5025018
2674 files changed
+233518 -77766

No files matched your search

+22 -4
View File
@@ -2,9 +2,9 @@
/**
* @brief Settings Class
* @author <a href='http://www.invisionpower.com'>Invision Power Services, Inc.</a>
* @copyright (c) 2001 - SVN_YYYY Invision Power Services, Inc.
* @copyright (c) 2001 - 2016 Invision Power Services, Inc.
* @license http://www.invisionpower.com/legal/standards/
* @package IPS Social Suite
* @package IPS Community Suite
* @since 18 Feb 2013
* @version SVN_VERSION_NUMBER
*/
@@ -67,6 +67,12 @@ class _Settings extends \IPS\Patterns\Singleton
{
unset( $INFO['use_friendly_urls'] );
}
/* If this is a legacy installation, it may have the (wrong) license key defined in conf_global. */
if( isset( $INFO['ipb_reg_number'] ) )
{
unset( $INFO['ipb_reg_number'] );
}
$this->data = $INFO;
}
@@ -81,14 +87,26 @@ class _Settings extends \IPS\Patterns\Singleton
*/
public function __get( $key )
{
$return = parent::__get( $key );
/* CiC hardcoded */
if ( \IPS\CIC )
{
if ( in_array( $key, array( 'xforward_matching', 'use_friendly_urls', 'htaccess_mod_rewrite', 'seo_r_on' ) ) )
{
return TRUE;
}
if ( $key == 'task_use_cron' )
{
return 'cron';
}
}
/* Get normally */
$return = parent::__get( $key );
if ( $return === NULL and !$this->loaded )
{
$this->loadFromDb();
return parent::__get( $key );
}
return $return;
}