Browse Source

! add missing text string
! prevent undefined index

Spuds 13 years ago
parent
commit
a9d228ebf4
2 changed files with 3 additions and 1 deletions
  1. 2 1
      Sources/Load.php
  2. 1 0
      Themes/default/languages/ManageSettings.english.php

+ 2 - 1
Sources/Load.php

@@ -166,7 +166,8 @@ function reloadSettings()
 				cache_put_data('loadavg', $modSettings['load_average'], 90);
 		}
 		
-		call_integration_hook('integrate_load_average', array($modSettings['load_average']));
+		if (!empty($modSettings['load_average']))
+			call_integration_hook('integrate_load_average', array($modSettings['load_average']));
 
 		if (!empty($modSettings['loadavg_forum']) && !empty($modSettings['load_average']) && $modSettings['load_average'] >= $modSettings['loadavg_forum'])
 			display_loadavg_error();

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

@@ -134,6 +134,7 @@ $txt['loadavg_search'] = 'Threshold to disabling search';
 $txt['loadavg_allunread'] = 'Threshold to disabling all unread topics';
 $txt['loadavg_unreadreplies'] = 'Threshold to disabling unread replies';
 $txt['loadavg_show_posts'] = 'Threshold to disabling showing user posts';
+$txt['loadavg_bbc'] = 'Threshold to disabling BBC formating when showing posts';
 $txt['loadavg_forum'] = 'Threshold to disabling the forum <strong>completely</strong>';
 $txt['loadavg_disabled_windows'] = '<span class="error">Load balancing support is not available on Windows.</span>';
 $txt['loadavg_disabled_conf'] = '<span class="error">Load balancing support is disabled by your host configuration.</span>';