friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Last minutes changes

This commit is contained in:
Michael 2017-01-07 13:52:30 +00:00
parent 1b48799f08
commit c2543f918b
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/dbstructure.php
View File

@ -806,7 +806,9 @@ function db_definition($charset) {
),
"indexes" => array(
"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(
@ -1160,6 +1162,7 @@ function db_definition($charset) {
"uid_contactid" => array("uid", "contact-id"),
"uid_profile" => array("uid", "profile"),
"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)"),
)
);

2
include/diaspora.php
View File

@ -766,7 +766,7 @@ class Diaspora {
intval($uid),
dbesc($nurl_sql)
);
if(dbm::is_result($r)) {
if (dbm::is_result($r)) {
return $r[0];
}

4
mod/photos.php
View File

@ -182,11 +182,11 @@ function photos_post(&$a) {
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),
intval($page_owner_uid)
);
if (! dbm::is_result($r)) {
if (!dbm::is_result($r)) {
notice( t('Album not found.') . EOL);
goaway($_SESSION['photo_return']);
return; // NOTREACHED