Merge branch 'master' of https://github.com/redmatrix/redmatrix

Conflicts: mod/impel.php
2015-05-27 19:27:38 -07:00
parent 675aa96f22 11301d51a5
commit b381ec5734
15 changed files with 355 additions and 75 deletions
--- a/include/identity.php
+++ b/include/identity.php
@@ -619,8 +619,9 @@ function profile_load(&$a, $nickname, $profile = '') {

 	logger('profile_load: ' . $nickname . (($profile) ? ' profile: ' . $profile : ''));

-	$user = q("select channel_id from channel where channel_address = '%s' limit 1",
-		dbesc($nickname)
+	$user = q("select channel_id from channel where channel_address = '%s' and not ( channel_pageflags & %d ) > 0  limit 1",
+		dbesc($nickname),
+		intval(PAGE_REMOVED)
 	);

 	if(! $user) {