diff options
| author | Habeas Codice <habeascodice@federated.social> | 2014-11-17 18:03:23 -0800 |
|---|---|---|
| committer | Habeas Codice <habeascodice@federated.social> | 2014-11-17 18:03:23 -0800 |
| commit | a7d58277a206c048b83a4802c983594f97cf9d6a (patch) | |
| tree | 18c468e186862eef45251ae870f6ec657d7c44de | |
| parent | 4529c20ba81f71a92be21133384dd825cd071409 (diff) | |
| parent | e61dbf722d35b748ff57b1260f30b9ac0fda60aa (diff) | |
| download | volse-hubzilla-a7d58277a206c048b83a4802c983594f97cf9d6a.tar.gz volse-hubzilla-a7d58277a206c048b83a4802c983594f97cf9d6a.tar.bz2 volse-hubzilla-a7d58277a206c048b83a4802c983594f97cf9d6a.zip | |
Merge branch 'master' of https://github.com/habeascodice/red
| -rw-r--r-- | mod/photos.php | 2 | ||||
| -rw-r--r-- | mod/poco.php | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/mod/photos.php b/mod/photos.php index ad95d6a88..ab848c709 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -618,7 +618,7 @@ function photos_content(&$a) { $album = hex2bin($datum); $r = q("SELECT `resource_id`, max(`scale`) AS `scale` FROM `photo` WHERE `uid` = %d AND `album` = '%s' - AND `scale` <= 4 and ((photo_flags = %d) or (photo_flags & %d )) $sql_extra GROUP BY `resource_id`", + AND `scale` <= 4 and ((photo_flags = %d) or (photo_flags & %d ) > 0) $sql_extra GROUP BY `resource_id`", intval($owner_uid), dbesc($album), intval(PHOTO_NORMAL), diff --git a/mod/poco.php b/mod/poco.php index fc01fc565..3f932e92f 100644 --- a/mod/poco.php +++ b/mod/poco.php @@ -69,7 +69,7 @@ function poco_init(&$a) { if($system_mode) { $r = q("SELECT count(*) as `total` from abook where ( abook_flags & " . ABOOK_FLAG_SELF . - " )>0 and abook_channel in (select uid from pconfig where cat = 'system' and k = 'suggestme' and v = 1) "); + " )>0 and abook_channel in (select uid from pconfig where cat = 'system' and k = 'suggestme' and v = '1') "); } else { $r = q("SELECT count(*) as `total` from abook where abook_channel = %d @@ -93,7 +93,7 @@ function poco_init(&$a) { if($system_mode) { $r = q("SELECT abook.*, xchan.* from abook left join xchan on abook_xchan = xchan_hash where ( abook_flags & " . ABOOK_FLAG_SELF . - " )>0 and abook_channel in (select uid from pconfig where cat = 'system' and k = 'suggestme' and v = 1) limit %d offset %d ", + " )>0 and abook_channel in (select uid from pconfig where cat = 'system' and k = 'suggestme' and v = '1') limit %d offset %d ", intval($itemsPerPage), intval($startIndex) ); |