! Search members by IP was broken (presumably due to Pete upgrading t…

…he IP system to support IPv6.) (ManageMembers.php) - Removing an error suppressor that I suspect should be unneeded now. (Subs-Cache.php)
C3realGuy · Apr 22, 2017 · ef31bf6 · ef31bf6
1 parent 7c269a1
commit ef31bf6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/core/app/ManageMembers.php b/core/app/ManageMembers.php
@@ -295,6 +295,8 @@ function ViewMemberlist()
 		// Can they see all IP addresses? If not, they shouldn't see any.
 		if (!allowedTo('manage_bans'))
 			unset($params['ip']);
+		elseif (isset($_POST['ip']))
+			$_POST['ip'] = expand_ip($_POST['ip']);
 
 		// !!! Validate a little more.
 

diff --git a/core/app/Subs-Cache.php b/core/app/Subs-Cache.php
@@ -1963,7 +1963,7 @@ function cache_get_data($orig_key, $ttl = 120, $put_callback = null)
 	elseif ($cache_system === 'xcache')
 		$val = xcache_get($key);
 	// Otherwise it's the file cache!
-	elseif (file_exists(CACHE_DIR . '/keys/' . $key . '.php') && @filesize(CACHE_DIR . '/keys/' . $key . '.php') > 10)
+	elseif (file_exists(CACHE_DIR . '/keys/' . $key . '.php') && filesize(CACHE_DIR . '/keys/' . $key . '.php') > 10)
 		include(CACHE_DIR . '/keys/' . $key . '.php');
 
 	if (!empty($db_show_debug))