This commit is contained in:
Friendika 2011-07-28 16:49:43 -07:00
parent c74f0f0cab
commit 04675e3ec3
3 changed files with 4 additions and 4 deletions

View File

@ -1,6 +1,6 @@
<?php <?php
define ( 'FRIENDIKA_VERSION', '2.2.1054' ); define ( 'FRIENDIKA_VERSION', '2.2.1055' );
define ( 'DFRN_PROTOCOL_VERSION', '2.21' ); define ( 'DFRN_PROTOCOL_VERSION', '2.21' );
define ( 'DB_UPDATE_VERSION', 1076 ); define ( 'DB_UPDATE_VERSION', 1076 );

View File

@ -903,7 +903,7 @@ function photos_content(&$a) {
$album = hex2bin($datum); $album = hex2bin($datum);
$r = q("SELECT `resource-id`, max(`scale`) AS `scale` FROM `photo` WHERE `uid` = %d AND `album` = '%s' $r = q("SELECT `resource-id`, max(`scale`) AS `scale` FROM `photo` WHERE `uid` = %d AND `album` = '%s'
AND `scale` < 4 $sql_extra GROUP BY `resource-id`", AND `scale` <= 4 $sql_extra GROUP BY `resource-id`",
intval($owner_uid), intval($owner_uid),
dbesc($album) dbesc($album)
); );
@ -913,7 +913,7 @@ function photos_content(&$a) {
} }
$r = q("SELECT `resource-id`, `id`, `filename`, max(`scale`) AS `scale`, `desc` FROM `photo` WHERE `uid` = %d AND `album` = '%s' $r = q("SELECT `resource-id`, `id`, `filename`, max(`scale`) AS `scale`, `desc` FROM `photo` WHERE `uid` = %d AND `album` = '%s'
AND `scale` < 4 $sql_extra GROUP BY `resource-id` ORDER BY `created` DESC LIMIT %d , %d", AND `scale` <= 4 $sql_extra GROUP BY `resource-id` ORDER BY `created` DESC LIMIT %d , %d",
intval($owner_uid), intval($owner_uid),
dbesc($album), dbesc($album),
intval($a->pager['start']), intval($a->pager['start']),

View File

@ -45,7 +45,7 @@ code {
border: 1px solid #444; border: 1px solid #444;
background: #EEE; background: #EEE;
color: #444; color: #444;
padding: 0px 10px 10px 10px; padding: 10px;
margin-top: 20px; margin-top: 20px;
} }
/*blockquote:before { /*blockquote:before {