Browse Source

Revert "Fixed Integration Hooks Management being enabled when it should be disabled"

This reverts commit b3cf48c30cf49fd8cfee73bcdcf83872fafc0ba4.
Rick Kerkhof 11 years ago
parent
commit
a0c5a2826f
3 changed files with 3 additions and 7 deletions
  1. 2 2
      Sources/Admin.php
  2. 1 4
      Sources/ManageSettings.php
  3. 0 1
      Themes/default/languages/Admin.english.php

+ 2 - 2
Sources/Admin.php

@@ -182,7 +182,7 @@ function AdminMain()
 					'icon' => 'modifications.png',
 					'subsections' => array(
 						'general' => array($txt['mods_cat_modifications_misc']),
-						'hooks' => array($txt['hooks_title_list'], 'enabled' => !empty($modSettings['handlinghooks_enabled'])),
+						'hooks' => array($txt['hooks_title_list']),
 						// Mod Authors for a "ADD AFTER" on this line. Ensure you end your change with a comma. For example:
 						// 'shout' => array($txt['shout']),
 						// Note the comma!! The setting with automatically appear with the first mod to be added.
@@ -996,4 +996,4 @@ function AdminEndSession()
 	redirectexit('action=admin');
 }
 
-?>
+?>

+ 1 - 4
Sources/ManageSettings.php

@@ -2207,9 +2207,6 @@ function ModifyGeneralModSettings($return_config = false)
 function list_integration_hooks()
 {
 	global $sourcedir, $scripturl, $context, $txt, $modSettings, $settings;
-	
-	if (empty($modSettings['handlinghooks_enabled']))
-		fatal_lang_error('handlinghooks_disabled');
 
 	$context['filter_url'] = '';
 	$context['current_filter'] = '';
@@ -2632,4 +2629,4 @@ function get_integration_hooks()
 	return $integration_hooks;
 }
 
-?>
+?>

+ 0 - 1
Themes/default/languages/Admin.english.php

@@ -708,7 +708,6 @@ $txt['paid_subscriptions'] = 'Paid Subscriptions';
 $txt['paid_subs_view'] = 'View Subscriptions';
 
 $txt['hooks_title_list'] = 'Integration Hooks';
-$txt['handlinghooks_disabled'] = 'Integration Hooks Management is disabled. Please enable it in the Admin panel before continuing.';
 $txt['hooks_field_hook_name'] = 'Hook Name';
 $txt['hooks_field_function_name'] = 'Function Name';
 $txt['hooks_field_function'] = 'Function';