Home Explore Help
Register Sign In
Omnimaga
/
SMF2.1
mirror of [email protected]:Omnimaga/SMF2.1.git
2
0
Fork 0
Files Issues 0 Wiki
Browse Source

Long lines then!

Signed-off-by: Suki <[email protected]>
Suki 10 years ago
parent
310f75a982
commit
5d33d1f278
11 changed files with 13 additions and 24 deletions
Split View Show Diff Stats
  1. 1 2
      Sources/Logging.php
  2. 2 4
      Sources/ManageBoards.php
  3. 1 2
      Sources/ManageErrors.php
  4. 1 2
      Sources/ManageLanguages.php
  5. 1 2
      Sources/ManageServer.php
  6. 1 2
      Sources/ManageSmileys.php
  7. 1 2
      Sources/Packages.php
  8. 1 2
      Sources/Subs-List.php
  9. 1 2
      Sources/Subs-Package.php
  10. 2 2
      Sources/Subs.php
  11. 1 2
      Sources/ViewQuery.php

+ 1 - 2
Sources/Logging.php
View File 

@@ -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)

+ 2 - 4
Sources/ManageBoards.php
View File 

@@ -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');

+ 1 - 2
Sources/ManageErrors.php
View File 

@@ -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');

+ 1 - 2
Sources/ManageLanguages.php
View File 

@@ -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']))

+ 1 - 2
Sources/ManageServer.php
View File 

@@ -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');

+ 1 - 2
Sources/ManageSmileys.php
View File 

@@ -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'];

+ 1 - 2
Sources/Packages.php
View File 

@@ -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');

+ 1 - 2
Sources/Subs-List.php
View File 

@@ -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']));

+ 1 - 2
Sources/Subs-Package.php
View File 

@@ -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))

+ 2 - 2
Sources/Subs.php
View File 

@@ -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.

+ 1 - 2
Sources/ViewQuery.php
View File 

@@ -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']))