10 lat temu · 5d33d1f278
--- a/Sources/Logging.php
+++ b/Sources/Logging.php
@@ -202,8 +202,7 @@ function logLastDatabaseError()
 
 function displayDebug()
 
 {
 
 	global $context, $scripturl, $boarddir, $modSettings, $boarddir;
 
-	global $db_cache, $db_count, $db_show_debug, $cache_count, $cache_hits;
 
-	global $smcFunc, $txt;
 
+	global $db_cache, $db_count, $db_show_debug, $cache_count, $cache_hits, $smcFunc, $txt;
 
 
 
 	// Add to Settings.php if you want to show the debugging information.
 
 	if (!isset($db_show_debug) || $db_show_debug !== true || (isset($_GET['action']) && $_GET['action'] == 'viewquery') || WIRELESS)
--- a/Sources/ManageBoards.php
+++ b/Sources/ManageBoards.php
@@ -81,8 +81,7 @@ function ManageBoards()
 
  */
 
 function ManageBoardsMain()
 
 {
 
-	global $txt, $context, $cat_tree, $boards, $boardList,
 
-	global $scripturl, $sourcedir, $txt, $smcFunc;
 
+	global $txt, $context, $cat_tree, $boards, $boardList, $scripturl, $sourcedir, $txt, $smcFunc;
 
 
 
 	loadTemplate('ManageBoards');
 
 
@@ -217,8 +216,7 @@ function ManageBoardsMain()
 
  */
 
 function EditCategory()
 
 {
 
-	global $txt, $context, $cat_tree, $boardList, $boards, 
 
-	global $smcFunc, $sourcedir;
 
+	global $txt, $context, $cat_tree, $boardList, $boards, $smcFunc, $sourcedir;
 
 
 
 	loadTemplate('ManageBoards');
 
 	require_once($sourcedir . '/Subs-Boards.php');
--- a/Sources/ManageErrors.php
+++ b/Sources/ManageErrors.php
@@ -332,8 +332,7 @@ function deleteErrors()
 
  */
 
 function ViewFile()
 
 {
 
-	global $context, $txt, $boarddir, $sourcedir, $cachedir;
 
-	global $smcFunc;
 
+	global $context, $txt, $boarddir, $sourcedir, $cachedir, $smcFunc;
 
 
 
 	// Check for the administrative permission to do this.
 
 	isAllowedTo('admin_forum');
--- a/Sources/ManageLanguages.php
+++ b/Sources/ManageLanguages.php
@@ -66,8 +66,7 @@ function ManageLanguages()
 
  */
 
 function AddLanguage()
 
 {
 
-	global $context, $sourcedir, $forum_version, $boarddir, $txt;
 
-	global $smcFunc, $scripturl;
 
+	global $context, $sourcedir, $forum_version, $boarddir, $txt, $smcFunc, $scripturl;
 
 
 
 	// Are we searching for new languages courtesy of Simple Machines?
 
 	if (!empty($_POST['smf_add_sub']))
--- a/Sources/ManageServer.php
+++ b/Sources/ManageServer.php
@@ -582,8 +582,7 @@ function prepareServerSettingsContext(&$config_vars)
 
  */
 
 function prepareDBSettingContext(&$config_vars)
 
 {
 
-	global $txt, $helptxt, $context, $modSettings, $sourcedir;
 
-	global $smcFunc;
 
+	global $txt, $helptxt, $context, $modSettings, $sourcedir, $smcFunc;
 
 
 
 	loadLanguage('Help');
 
 
--- a/Sources/ManageSmileys.php
+++ b/Sources/ManageSmileys.php
@@ -536,8 +536,7 @@ function list_getNumSmileySets()
 
  */
 
 function AddSmiley()
 
 {
 
-	global $modSettings, $context, $settings, $txt, $boarddir,
 
-	global $smcFunc;
 
+	global $modSettings, $context, $settings, $txt, $boarddir, $smcFunc;
 
 
 
 	// Get a list of all known smiley sets.
 
 	$context['smileys_dir'] = empty($modSettings['smileys_dir']) ? $boarddir . '/Smileys' : $modSettings['smileys_dir'];
--- a/Sources/Packages.php
+++ b/Sources/Packages.php
@@ -1241,8 +1241,7 @@ function PackageList()
 
  */
 
 function ExamineFile()
 
 {
 
-	global $txt, $scripturl, $boarddir, $context, $sourcedir;
 
-	global $smcFunc, $packagesdir;
 
+	global $txt, $scripturl, $boarddir, $context, $sourcedir, $packagesdir, $smcFunc;
 
 
 
 	require_once($sourcedir . '/Subs-Package.php');
 
 
--- a/Sources/Subs-List.php
+++ b/Sources/Subs-List.php
@@ -22,8 +22,7 @@ if (!defined('SMF'))
 
 
 
 function createList($listOptions)
 
 {
 
-	global $context, $settings, $options, $txt, $modSettings;
 
-	global $scripturl, $smcFunc;
 
+	global $context, $settings, $options, $txt, $modSettings, $scripturl, $smcFunc;
 
 
 
 	assert(isset($listOptions['id']));
 
 	assert(isset($listOptions['columns']));
--- a/Sources/Subs-Package.php
+++ b/Sources/Subs-Package.php
@@ -1031,8 +1031,7 @@ function packageRequireFTP($destination_url, $files = null, $return = false)
 
  */
 
 function parsePackageInfo(&$packageXML, $testing_only = true, $method = 'install', $previous_version = '')
 
 {
 
-	global $boarddir, $packagesdir, $forum_version, $context, $temp_path;
 
-	global $language, $smcFunc;
 
+	global $boarddir, $packagesdir, $forum_version, $context, $temp_path, $language, $smcFunc;
 
 
 
 	// Mayday!  That action doesn't exist!!
 
 	if (empty($packageXML) || !$packageXML->exists($method))
--- a/Sources/Subs.php
+++ b/Sources/Subs.php
@@ -2843,8 +2843,8 @@ function determineTopicClass(&$topic_context)
 
  */
 
 function setupThemeContext($forceload = false)
 
 {
 
-	global $modSettings, $user_info, $scripturl, $context, $settings;
 
-	global $user_settings, $smcFunc, $options, $txt, $maintenance;
 
+	global $modSettings, $user_info, $scripturl, $context, $settings, $options, $txt, $maintenance;
 
+	global $user_settings, $smcFunc;
 
 	static $loaded = false;
 
 
 
 	// Under SSI this function can be called more then once.  That can cause some problems.
--- a/Sources/ViewQuery.php
+++ b/Sources/ViewQuery.php
@@ -27,8 +27,7 @@ if (!defined('SMF'))
 
  */
 
 function ViewQuery()
 
 {
 
-	global $scripturl, $user_info, $settings, $context, $db_connection;
 
-	global $modSettings, $boarddir, $smcFunc, $txt, $db_show_debug;
 
+	global $scripturl, $user_info, $settings, $context, $db_connection, $modSettings, $boarddir, $smcFunc, $txt, $db_show_debug;
 
 
 
 	// We should have debug mode enabled, as well as something to display!
 
 	if (!isset($db_show_debug) || $db_show_debug !== true || !isset($_SESSION['debug']))