revup

diff --git a/boot.php b/boot.php
index 7e46d92eb416b62ae5a5e0fab86c09a82875666e..f7a0b50bc5679d02250cb6b971f23a696b9f513c 100644 (file)
--- 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 2941fa32a57c6a263a6726a751abb33354dd2daa..cb13b760364e72df276db5c3db5dc8eeeef0e074 100644 (file)
--- 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 e2b1a57dc5078768e068dde1aec5e8ab5182feba..28c1ce9a13aa1d69ce184d5823d0992cd2ad0034 100644 (file)
--- 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 {