Streams/streams
Streams/streams
1
0
Fork 0
mirror of https://codeberg.org/streams/streams.git synced 2024-09-20 08:15:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'dev' of /home/macgirvin/./streams into dev

Browse source
This commit is contained in:
nobody 2022-02-22 18:16:28 -08:00
commit 911c83af12
4 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Code/Module/Cover_photo.php
View file

@ -167,7 +167,7 @@ class Cover_photo extends Controller
$orig_srcw = ($srcW / $scaled_width) * $base_image['width'];
$orig_srch = ($srcH / $scaled_height) * $base_image['height'];
$im->cropImageRect(1200, 435, $orig_srcx, $orig_srcy, $orig_srcw, $orig_srch);
$im->cropImageRect(1200, 675, $orig_srcx, $orig_srcy, $orig_srcw, $orig_srch);
$aid = get_account_id();
@ -188,12 +188,12 @@ class Cover_photo extends Controller
$r1 = $im->storeThumbnail($p, PHOTO_RES_COVER_1200);
$im->doScaleImage(850, 310);
$im->doScaleImage(850, 478);
$p['imgscale'] = 8;
$r2 = $im->storeThumbnail($p, PHOTO_RES_COVER_850);
$im->doScaleImage(425, 160);
$im->doScaleImage(425, 239);
$p['imgscale'] = 9;
$r3 = $im->storeThumbnail($p, PHOTO_RES_COVER_425);

6
boot.php
View file

@ -251,9 +251,9 @@ define ( 'PHOTO_RES_PROFILE_300', 4 ); // square 300 px
define ( 'PHOTO_RES_PROFILE_80', 5 ); // square 80 px
define ( 'PHOTO_RES_PROFILE_48', 6 ); // square 48 px
define ( 'PHOTO_RES_COVER_1200', 7 ); // 1200w x 435h (2.75:1)
define ( 'PHOTO_RES_COVER_850', 8 ); // 850w x 310h
define ( 'PHOTO_RES_COVER_425', 9 ); // 425w x 160h
define ( 'PHOTO_RES_COVER_1200', 7 ); // 1200w x 675h (16:9)
define ( 'PHOTO_RES_COVER_850', 8 ); // 850w x 478h
define ( 'PHOTO_RES_COVER_425', 9 ); // 425w x 239h
/**

4
include/photos.php
View file

@ -413,11 +413,11 @@ function photo_upload($channel, $observer, $args)
if (array_path_exists('/directory/hash',$args)) {
$album_link = '[zrl=' . z_root() . '/photos/' . $channel['channel_address'] . '/album/' . $args['directory']['hash'] . ']' . ((strlen($album)) ? $album : '/') . '[/zrl]';
$activity_format = sprintf(t('%1$s posted %2$s to %3$s', 'photo_upload'), $author_link, $photo_link, $album_link);
}
else {
$album_link = EMPTY_STR;
$activity_format = sprintf(t('%1$s posted %2$s', 'photo_upload'), $author_link, $photo_link);
}
$activity_format = sprintf(t('%1$s posted %2$s to %3$s', 'photo_upload'), $author_link, $photo_link, $album_link);
$body = (($args['body']) ? $args['body'] : '') . '[footer]' . $activity_format . '[/footer]';

2
version.php
View file

@ -1,2 +1,2 @@
<?php
define ( 'STD_VERSION', '22.02.19' );
define ( 'STD_VERSION', '22.02.22' );