Version 3.4.6

This commit is contained in:
Neo committed 2025-12-19 00:40:53 -08:00
1 parent e4478369d8
commit b45ea0dffb
1568 files changed
+155104 -161665

No files matched your search

@@ -3,17 +3,17 @@
/**
* <pre>
* Invision Power Services
* IP.Board v3.4.5
* IP.Board v3.4.6
* Admin Output Library
* Last Updated: $LastChangedDate: 2013-05-20 16:38:23 -0400 (Mon, 20 May 2013) $
* Last Updated: $LastChangedDate: 2013-10-16 12:57:41 -0400 (Wed, 16 Oct 2013) $
* </pre>
*
* @author $Author: bfarber $
* @author $Author: AndyMillne $
* @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: 12261 $
* @version $Rev: 12380 $
*
*/
@@ -218,7 +218,7 @@ class adminOutput extends output
else
{
foreach( ipsRegistry::$applications as $app_dir => $app_data )
{
{
if ( in_array( $app_data['app_directory'], array( 'core', 'forums', 'members' ) ) || in_array( $app_data['app_directory'], $mainTabKeys ) || $this->registry->getClass('class_permissions')->checkForAppAccess( $app_data['app_directory'] ) !== TRUE || ! $app_data['app_enabled'] )
{
continue;
@@ -227,6 +227,14 @@ class adminOutput extends output
$this->otherTabKeys[] = $app_data['app_directory'];
}
foreach( array( 'lookfeel', 'support', 'reports' ) AS $v )
{
if ( ! in_array( $v, $this->tabKeys ) )
{
$this->otherTabKeys[] = $v;
}
}
}
}
@@ -275,7 +283,7 @@ class adminOutput extends output
{
$fakeAppActive[ $fa ] = true;
$fakeActive = true;
$fakeActive = true;
}
}
}
@@ -656,8 +664,10 @@ class adminOutput extends output
* @param string Text to display
* @return @e void
*/
public function multipleRedirectFinish($text='Завершено!')
public function multipleRedirectFinish($text='')
{
$text = ( $text ) ? $text : $this->lang->words['mr_completed'];
print $this->global_template->global_redirect_done( $text );
exit();
}
@@ -828,7 +838,7 @@ class adminOutput extends output
$_bookmarkData = array( 'url' => $bookmarks->cleanUrl( $this->settings['query_string_safe'] ),
'can' => ( $this->_canBookmark ? 'true' : 'false' ),
'has' => ( $bookmarks->hasBookmarked( $this->settings['query_string_safe'] ) ? 'true' : 'false' ),
'jsn' => $bookmarks->asJson() );
'jsn' => $bookmarks->asJson() );
//-----------------------------------------
// Get tab order
@@ -1662,7 +1672,7 @@ class adminOutput extends output
$this->lang->loadLanguageFile( array( 'admin_menulang' ), $app_dir );
foreach( $data as $_current_module => $module_data )
{
{
$_thisApp = $app_dir;
$__current_module = $_current_module;
$_current_module = preg_replace( '/^\d+?_(.*)$/', "\\1", $_current_module );