Version 4.7.0
This commit is contained in:
1 parent
517a5e1f70
commit
8ba7d43898
1933 files changed
+65613
-11332
No files matched your search
@@ -54,11 +54,6 @@ class _Settings extends \IPS\Patterns\Singleton
|
||||
$allowedFields = $this->getAllowedFields();
|
||||
|
||||
require( \IPS\SITE_FILES_PATH . '/conf_global.php' );
|
||||
if ( \IPS\CIC2 )
|
||||
{
|
||||
$INFO['sql_pass'] = $_SERVER['IPS_CLOUD2_DBPASS'];
|
||||
$INFO['sql_read_pass'] = $_SERVER['IPS_CLOUD2_DBPASS'];
|
||||
}
|
||||
if ( isset( $INFO ) )
|
||||
{
|
||||
if( isset( $INFO['board_url'] ) AND ( !isset( $INFO['base_url'] ) OR !$INFO['base_url'] ) )
|
||||
@@ -106,7 +101,7 @@ class _Settings extends \IPS\Patterns\Singleton
|
||||
* @return mixed Value from the datastore
|
||||
*/
|
||||
public function __get( $key )
|
||||
{
|
||||
{
|
||||
/* CiC hardcoded */
|
||||
if ( \IPS\CIC )
|
||||
{
|
||||
@@ -120,11 +115,6 @@ class _Settings extends \IPS\Patterns\Singleton
|
||||
}
|
||||
}
|
||||
|
||||
if ( \IPS\CIC2 and $key == 'archive_on' )
|
||||
{
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
/* Get normally */
|
||||
$return = parent::__get( $key );
|
||||
if ( $return === NULL and !$this->loaded )
|
||||
|
||||
Reference in new issue
Block a user