Merge remote-tracking branch 'friendica/develop' into bug/fix-diaspora-people-links

# Conflicts: # include/follow.php
2016-12-20 12:50:36 -05:00
parent 177f93f9a5 7141ce9163
commit e8e1f9253d
148 changed files with 12178 additions and 11976 deletions
--- a/mod/p.php
+++ b/mod/p.php
@@ -48,7 +48,7 @@ function p_init($a){
 	$r = q("SELECT `user`.`prvkey`, `contact`.`addr`, `user`.`nickname`, `contact`.`nick` FROM `user`
 		INNER JOIN `contact` ON `contact`.`uid` = `user`.`uid`
 		WHERE `user`.`uid` = %d", intval($item[0]["uid"]));
-	if (!$r) {
+	if (!dbm::is_result($r)) {
 		header($_SERVER["SERVER_PROTOCOL"].' 404 '.t('Not Found'));
 		killme();
 	}