Bladeren bron

! Couple of left over loadfiles removed

Spuds 12 jaren geleden
bovenliggende
commit
636b59a151
2 gewijzigde bestanden met toevoegingen van 6 en 7 verwijderingen
  1. 4 4
      Sources/ManagePaid.php
  2. 2 3
      Sources/Memberlist.php

+ 4 - 4
Sources/ManagePaid.php

@@ -187,7 +187,7 @@ function ModifySubscriptionSettings($return_config = false)
  */
 function ViewSubscriptions()
 {
-	global $context, $txt, $modSettings, $smcFunc, $scripturl;
+	global $context, $txt, $modSettings, $smcFunc, $scripturl, $sourcedir;
 
 	// Not made the settings yet?
 	if (empty($modSettings['paid_currency_symbol']))
@@ -317,7 +317,7 @@ function ViewSubscriptions()
 		),
 	);
 
-	loadFile('Subs-List.php');
+	require_once($sourcedir . '/Subs-List.php');
 	createList($listOptions);
 
 	$context['sub_template'] = 'show_list';
@@ -591,7 +591,7 @@ function ModifySubscription()
  */
 function ViewSubscribedUsers()
 {
-	global $context, $txt, $modSettings, $scripturl, $options, $smcFunc;
+	global $context, $txt, $modSettings, $scripturl, $options, $smcFunc, $sourcedir;
 
 	// Setup the template.
 	$context['page_title'] = $txt['viewing_users_subscribed'];
@@ -777,7 +777,7 @@ function ViewSubscribedUsers()
 		),
 	);
 
-	loadFile('Subs-List.php');
+	require_once($sourcedir . '/Subs-List.php');
 	createList($listOptions);
 
 	$context['sub_template'] = 'show_list';

+ 2 - 3
Sources/Memberlist.php

@@ -590,7 +590,6 @@ function printMemberListRows($request)
 	}
 }
 
-
 /**
  * Used as a popup for searching members.
  * Uses sub template find_members of the Help template.
@@ -598,7 +597,7 @@ function printMemberListRows($request)
  */
 function JSMembers()
 {
-	global $context, $scripturl, $user_info, $smcFunc;
+	global $context, $scripturl, $user_info, $smcFunc, $sourcedir;
 
 	checkSession('get');
 
@@ -635,7 +634,7 @@ function JSMembers()
 	// If the user has done a search, well - search.
 	if (isset($_REQUEST['search']))
 	{
-		loadFile('Subs-Members.php');
+		require_once($sourcedir . 'Subs-Members.php');
 		$_REQUEST['search'] = $smcFunc['htmlspecialchars']($_REQUEST['search'], ENT_QUOTES);
 
 		$context['results'] = findMembers(array($_REQUEST['search']), true, $context['buddy_search']);