push refresh messages, performance work on conversations and configs, doc updates

1 files changed, 25 insertions, 9 deletions

diff --git a/include/config.php b/include/config.php
index 5db0a3d05..92fae165b 100644
--- a/include/config.php
+++ b/include/config.php
@@ -129,19 +129,35 @@ function del_config($family,$key) {
 
 function load_pconfig($uid,$family) {
 	global $a;
-	$r = q("SELECT * FROM `pconfig` WHERE `cat` = '%s' AND `uid` = %d",
-		dbesc($family),
-		intval($uid)
-	);
-	if(count($r)) {
+
+	if(! array_key_exists($uid,$a->config))
+		$a->config[$uid] = array();
+
+	if($family) {
+		$r = q("SELECT * FROM `pconfig` WHERE `cat` = '%s' AND `uid` = %d",
+			dbesc($family),
+			intval($uid)
+		);
+	}
+	else {
+		$r = q("SELECT * FROM `pconfig` WHERE `uid` = %d",
+			intval($uid)
+		);
+	}
+
+	if($r) {
 		foreach($r as $rr) {
 			$k = $rr['k'];
-			$a->config[$uid][$family][$k] = $rr['v'];
+			$c = $rr['cat'];
+			if(! array_key_exists($c,$a->config[$uid]))
+				$a->config[$uid][$c] = array();
+			$a->config[$uid][$c][$k] = $rr['v'];
 		}
-	} else if ($family != 'config') {
+	} 
+//	else if ($family != 'config') {
 		// Negative caching
-		$a->config[$uid][$family] = "!<unset>!";
-	}
+//		$a->config[$uid][$family] = "!<unset>!";
+//	}
 }