Version 3.4.8
This commit is contained in:
1 parent
b45ea0dffb
commit
c603205a25
1398 files changed
+36675
-31023
No files matched your search
@@ -3,17 +3,17 @@
|
||||
/**
|
||||
* <pre>
|
||||
* Invision Power Services
|
||||
* IP.Board v3.4.6
|
||||
* IP.Board v3.4.8
|
||||
* Admin Output Library
|
||||
* Last Updated: $LastChangedDate: 2013-10-16 12:57:41 -0400 (Wed, 16 Oct 2013) $
|
||||
* Last Updated: $LastChangedDate: 2015-05-11 04:44:42 -0400 (Mon, 11 May 2015) $
|
||||
* </pre>
|
||||
*
|
||||
* @author $Author: AndyMillne $
|
||||
* @author $Author: stuarts $
|
||||
* @copyright (c) 2001 - 2009 Invision Power Services, Inc.
|
||||
* @license http://www.invisionpower.com/company/standards.php#license
|
||||
* @package IP.Board
|
||||
* @link http://www.invisionpower.com
|
||||
* @version $Rev: 12380 $
|
||||
* @version $Rev: 12637 $
|
||||
*
|
||||
*/
|
||||
|
||||
@@ -149,6 +149,27 @@ class adminOutput extends output
|
||||
$this->settings['base_url'] = $this->settings['base_url'] . 'app=' . IPS_APP_COMPONENT . '&';
|
||||
|
||||
$this->settings['extraJsModules'] = '';
|
||||
|
||||
/* HTTPS fixes */
|
||||
if( $this->isHTTPS )
|
||||
{
|
||||
$this->enableAcpHTTPS();
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Enable HTTPS
|
||||
*
|
||||
* @return @e void
|
||||
*/
|
||||
public function enableAcpHTTPS()
|
||||
{
|
||||
$this->settings['skin_acp_url'] = str_replace( 'http://', 'https://', $this->settings['skin_acp_url'] );
|
||||
$this->settings['js_main_url'] = str_replace( 'http://', 'https://', $this->settings['js_main_url'] );
|
||||
$this->settings['css_base_url'] = str_replace( 'http://', 'https://', $this->settings['css_base_url'] );
|
||||
$this->settings['js_base_url'] = str_replace( 'http://', 'https://', $this->settings['js_base_url'] );
|
||||
$this->settings['base_url'] = str_replace( 'http://', 'https://', $this->settings['base_url'] );
|
||||
$this->settings['js_app_url'] = str_replace( 'http://', 'https://', $this->settings['js_app_url'] );
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -666,7 +687,9 @@ class adminOutput extends output
|
||||
*/
|
||||
public function multipleRedirectFinish($text='')
|
||||
{
|
||||
$text = ( $text ) ? $text : $this->lang->words['mr_completed'];
|
||||
$this->lang->loadLanguageFile( array( 'admin_tools' ), 'core' );
|
||||
|
||||
$text = ! empty( $text ) ? $text : $this->lang->words['mr_completed'];
|
||||
|
||||
print $this->global_template->global_redirect_done( $text );
|
||||
exit();
|
||||
|
||||
Reference in new issue
Block a user