From 15aee8920041aeaf3c9d8893341bc5470ec63ff8 Mon Sep 17 00:00:00 2001
From: Meik Sievertsen <acydburn@phpbb.com>
Date: Wed, 2 May 2007 16:19:35 +0000
Subject: fixes for search button in header - #10389, #10225, #9548 added
 missing colour swatch to prosilver - #8657 language changes - #10387, #10375,
 #10373, #10353, #10279 line-height for font size (still not ideal) - #10317
 Search load setting checked in sessions.php along with limit_load and also
 reset if not possible to determine load - #10383 Fix editing issues - #9660

git-svn-id: file:///svn/phpbb/trunk@7451 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/includes/session.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'phpBB/includes/session.php')

diff --git a/phpBB/includes/session.php b/phpBB/includes/session.php
index 37b251cdaf..467b9258b6 100644
--- a/phpBB/includes/session.php
+++ b/phpBB/includes/session.php
@@ -198,7 +198,7 @@ class session
 		$this->load = false;
 
 		// Load limit check (if applicable)
-		if ($config['limit_load'])
+		if ($config['limit_load'] || $config['limit_search_load'])
 		{
 			if ($load = @file_get_contents('/proc/loadavg'))
 			{
@@ -208,6 +208,7 @@ class session
 			else
 			{
 				set_config('limit_load', '0');
+				set_config('limit_search_load', '0');
 			}
 		}
 
-- 
cgit v1.2.1