aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriendika <info@friendika.com>2011-07-28 16:49:43 -0700
committerFriendika <info@friendika.com>2011-07-28 16:49:43 -0700
commit04675e3ec3cd5951d651998489a1d04247f1026b (patch)
tree7a3e618b670ed5b892c9130908788263e874a338
parentc74f0f0cabc774b1dc1719b2ebc7409179d26ca4 (diff)
downloadvolse-hubzilla-04675e3ec3cd5951d651998489a1d04247f1026b.tar.gz
volse-hubzilla-04675e3ec3cd5951d651998489a1d04247f1026b.tar.bz2
volse-hubzilla-04675e3ec3cd5951d651998489a1d04247f1026b.zip
revup
-rw-r--r--boot.php2
-rw-r--r--mod/photos.php4
-rw-r--r--view/theme/duepuntozero/style.css2
3 files changed, 4 insertions, 4 deletions
diff --git a/boot.php b/boot.php
index 7e46d92eb..f7a0b50bc 100644
--- a/boot.php
+++ b/boot.php
@@ -1,6 +1,6 @@
<?php
-define ( 'FRIENDIKA_VERSION', '2.2.1054' );
+define ( 'FRIENDIKA_VERSION', '2.2.1055' );
define ( 'DFRN_PROTOCOL_VERSION', '2.21' );
define ( 'DB_UPDATE_VERSION', 1076 );
diff --git a/mod/photos.php b/mod/photos.php
index 2941fa32a..cb13b7603 100644
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -903,7 +903,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 $sql_extra GROUP BY `resource-id`",
+ AND `scale` <= 4 $sql_extra GROUP BY `resource-id`",
intval($owner_uid),
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'
- 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),
dbesc($album),
intval($a->pager['start']),
diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css
index e2b1a57dc..28c1ce9a1 100644
--- a/view/theme/duepuntozero/style.css
+++ b/view/theme/duepuntozero/style.css
@@ -45,7 +45,7 @@ code {
border: 1px solid #444;
background: #EEE;
color: #444;
- padding: 0px 10px 10px 10px;
+ padding: 10px;
margin-top: 20px;
}
/*blockquote:before {