Merge branch 'rewrites/dbm_is_result' into develop

This commit is contained in:
Roland Häder 2016-12-19 14:47:05 +01:00
commit dac1dbd3e9
11 changed files with 20 additions and 19 deletions

View file

@ -92,7 +92,7 @@ function profiles_init(&$a) {
intval(local_user()),
intval($a->argv[2])
);
if(! count($r1)) {
if(! dbm::is_result($r1)) {
notice( t('Profile unavailable to clone.') . EOL);
killme();
return;
@ -116,7 +116,7 @@ function profiles_init(&$a) {
dbesc($name)
);
info( t('New profile created.') . EOL);
if(count($r3) == 1)
if ((dbm::is_result($r3)) && (count($r3) == 1))
goaway('profiles/'.$r3[0]['id']);
goaway('profiles');

View file

@ -12,14 +12,14 @@ function user_allow($hash) {
);
if(! count($register))
if(! dbm::is_result($register))
return false;
$user = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1",
intval($register[0]['uid'])
);
if(! count($user))
if(! dbm::is_result($user))
killme();
$r = q("DELETE FROM `register` WHERE `hash` = '%s'",
@ -69,7 +69,7 @@ function user_deny($hash) {
dbesc($hash)
);
if(! count($register))
if(! dbm::is_result($register))
return false;
$user = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1",