From c8b3557802733f4eb60bad18638298d9acfadf8c Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Fri, 21 Aug 2009 06:33:12 -0400
Subject: make common_config() handle nulls correctly

---
 lib/util.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'lib/util.php')

diff --git a/lib/util.php b/lib/util.php
index cd9bd9ed8..d1f3bed9e 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -1152,7 +1152,8 @@ function common_negotiate_type($cprefs, $sprefs)
 function common_config($main, $sub)
 {
     global $config;
-    return isset($config[$main][$sub]) ? $config[$main][$sub] : false;
+    return (array_key_exists($main, $config) &&
+            array_key_exists($sub, $config[$main])) ? $config[$main][$sub] : false;
 }
 
 function common_copy_args($from)
-- 
cgit v1.2.3-54-g00ecf