Merge remote branch 'upstream/master'

2014-09-29 15:46:56 -07:00
parent e62a95aaba 7c3b428e67
commit 79bb60aafd
7 changed files with 1989 additions and 1372 deletions
@@ -248,7 +248,7 @@ function load_pconfig($uid) {
 * @return mixed Stored value or false if it does not exist
 */
 function get_pconfig($uid, $family, $key, $instore = false) {
-	logger('include/config.php: get_pconfig() deprecated instore param used', LOGGER_DEBUG);
+//	logger('include/config.php: get_pconfig() deprecated instore param used', LOGGER_DEBUG);
 	global $a;

 	if($uid === false)