Last minutes changes
This commit is contained in:
parent
1b48799f08
commit
c2543f918b
|
@ -806,7 +806,9 @@ function db_definition($charset) {
|
||||||
),
|
),
|
||||||
"indexes" => array(
|
"indexes" => array(
|
||||||
"PRIMARY" => array("id"),
|
"PRIMARY" => array("id"),
|
||||||
"uid_gid_contactid" => array("UNIQUE", "uid","gid","contact-id"),
|
"cid_contactid" => array("cid", "contact-id"),
|
||||||
|
"uid_contactid" => array("uid", "contact-id"),
|
||||||
|
"uid_gid_contactid" => array("UNIQUE", "uid", "gid", "contact-id"),
|
||||||
)
|
)
|
||||||
);
|
);
|
||||||
$database["gserver"] = array(
|
$database["gserver"] = array(
|
||||||
|
@ -1160,6 +1162,7 @@ function db_definition($charset) {
|
||||||
"uid_contactid" => array("uid", "contact-id"),
|
"uid_contactid" => array("uid", "contact-id"),
|
||||||
"uid_profile" => array("uid", "profile"),
|
"uid_profile" => array("uid", "profile"),
|
||||||
"uid_album_created" => array("uid", "album(32)", "created"),
|
"uid_album_created" => array("uid", "album(32)", "created"),
|
||||||
|
"uid_album_resource-id_created" => array("uid", "album(32)", "resource-id(64)", "created"),
|
||||||
"resource-id" => array("resource-id(64)"),
|
"resource-id" => array("resource-id(64)"),
|
||||||
)
|
)
|
||||||
);
|
);
|
||||||
|
|
|
@ -766,7 +766,7 @@ class Diaspora {
|
||||||
intval($uid),
|
intval($uid),
|
||||||
dbesc($nurl_sql)
|
dbesc($nurl_sql)
|
||||||
);
|
);
|
||||||
if(dbm::is_result($r)) {
|
if (dbm::is_result($r)) {
|
||||||
return $r[0];
|
return $r[0];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -182,11 +182,11 @@ function photos_post(&$a) {
|
||||||
return; // NOTREACHED
|
return; // NOTREACHED
|
||||||
}
|
}
|
||||||
|
|
||||||
$r = qu("SELECT count(*) FROM `photo` WHERE `album` = '%s' AND `uid` = %d",
|
$r = qu("SELECT `album` FROM `photo` WHERE `album` = '%s' AND `uid` = %d",
|
||||||
dbesc($album),
|
dbesc($album),
|
||||||
intval($page_owner_uid)
|
intval($page_owner_uid)
|
||||||
);
|
);
|
||||||
if (! dbm::is_result($r)) {
|
if (!dbm::is_result($r)) {
|
||||||
notice( t('Album not found.') . EOL);
|
notice( t('Album not found.') . EOL);
|
||||||
goaway($_SESSION['photo_return']);
|
goaway($_SESSION['photo_return']);
|
||||||
return; // NOTREACHED
|
return; // NOTREACHED
|
||||||
|
|
Loading…
Reference in New Issue
Block a user