From c2543f918b3c9fc6cc8655fb2f4e9f99752e0901 Mon Sep 17 00:00:00 2001 From: Michael Date: Sat, 7 Jan 2017 13:52:30 +0000 Subject: [PATCH] Last minutes changes --- include/dbstructure.php | 5 ++++- include/diaspora.php | 2 +- mod/photos.php | 4 ++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/include/dbstructure.php b/include/dbstructure.php index 8f47dc16e9..e519562b49 100644 --- a/include/dbstructure.php +++ b/include/dbstructure.php @@ -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)"), ) ); diff --git a/include/diaspora.php b/include/diaspora.php index 2b9e61331f..54bc744541 100644 --- a/include/diaspora.php +++ b/include/diaspora.php @@ -766,7 +766,7 @@ class Diaspora { intval($uid), dbesc($nurl_sql) ); - if(dbm::is_result($r)) { + if (dbm::is_result($r)) { return $r[0]; } diff --git a/mod/photos.php b/mod/photos.php index 4b6704a719..4880e7feb7 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -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 -- 2.39.5