]> git.mxchange.org Git - friendica.git/commitdiff
Some Bugfixings
authorPhilipp <admin@philipp.info>
Mon, 4 Oct 2021 10:58:28 +0000 (12:58 +0200)
committerPhilipp <admin@philipp.info>
Mon, 4 Oct 2021 11:00:35 +0000 (13:00 +0200)
- Remove 'adjust' from ping list ( FollowUp https://github.com/friendica/friendica/commit/9935e8e71180f99d57e52f0e3c0ca99c0836219a )
- Fix Photo::selectFirst condition/parameter mixup

mod/fbrowser.php
mod/ping.php

index 359e83e111e9f14889c975eefadab2e809974c36..45e960feceb828fbfd5e43f1bcc9b085f27701d5 100644 (file)
@@ -79,7 +79,7 @@ function fbrowser_content(App $a)
                                $filename_e = $rr['filename'];
 
                                // Take the largest picture that is smaller or equal 640 pixels
-                               $photo = Photo::selectFirst(['scale'], ["`resource-id` = ? AND `height` <= ? AND `width` <= ?", $rr['resource-id'], 640, 640, ['order' => ['scale']]]);
+                               $photo = Photo::selectFirst(['scale'], ["`resource-id` = ? AND `height` <= ? AND `width` <= ?", $rr['resource-id'], 640, 640], ['order' => ['scale']]);
                                $scale = $photo['scale'] ?? $rr['loq'];
 
                                return [
index db5bc044611c20926c8de055bde728053aaa0285..178d297a422e8d4547bb060794109a898bd63beb 100644 (file)
@@ -207,7 +207,7 @@ function ping_init(App $a)
                $cachekey = "ping_init:".local_user();
                $ev = DI::cache()->get($cachekey);
                if (is_null($ev)) {
-                       $ev = DBA::selectToArray('event', ['type', 'start', 'adjust'],
+                       $ev = DBA::selectToArray('event', ['type', 'start'],
                                ["`uid` = ? AND `start` < ? AND `finish` > ? AND NOT `ignore`",
                                local_user(), DateTimeFormat::utc('now + 7 days'), DateTimeFormat::utcNow()]);
                        if (DBA::isResult($ev)) {