Merge branch '9.2.x' into misc-fixes-120623

wordish · Dec 7, 2023 · 06e7e33 · 06e7e33
2 parents 4a963a1 + 4075c46
commit 06e7e33
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 6 deletions.
diff --git a/concrete/blocks/image/view.php b/concrete/blocks/image/view.php
@@ -114,8 +114,8 @@
                 $thumb = $im->getThumbnail($f, $maxWidth, $maxHeight, $cropImage);
 
                 $imageTag->setAttribute("src", $thumb->src);
-                $imageTag->setAttribute("width", $thumb->width);
-                $imageTag->setAttribute("height", $thumb->height);
+                $imageTag->setAttribute("width", $thumb->width ?? null);
+                $imageTag->setAttribute("height", $thumb->height ?? null);
 
                 break;
         }

diff --git a/concrete/config/concrete.php b/concrete/config/concrete.php
@@ -8,7 +8,7 @@
      */
     'version' => '9.2.4',
     'version_installed' => '9.2.4',
-    'version_db' => '20231002142400', // the key of the latest database migration
+    'version_db' => '20231207100748', // the key of the latest database migration
 
     /*
      * Installation status

diff --git a/concrete/src/Entity/Announcement/AnnouncementUserView.php b/concrete/src/Entity/Announcement/AnnouncementUserView.php
@@ -16,7 +16,7 @@ class AnnouncementUserView
     /**
      * @ORM\Id
      * @ORM\ManyToOne(targetEntity="Concrete\Core\Entity\User\User")
-     * @ORM\JoinColumn(name="uID", referencedColumnName="uID")
+     * @ORM\JoinColumn(name="uID", referencedColumnName="uID", onDelete="CASCADE")
      */
     protected $user;
 

diff --git a/concrete/src/Updater/ApplicationUpdate.php b/concrete/src/Updater/ApplicationUpdate.php
@@ -108,8 +108,8 @@ public static function get($dir)
     {
         $version_file = DIR_CORE_UPDATES . "/{$dir}/" . DIRNAME_CORE . '/config/concrete.php';
 
-        $concrete = @include $version_file;
-        if ($concrete['version'] != false) {
+        $concrete = is_file($version_file) ? @include $version_file : null;
+        if (is_array($concrete) && !empty($concrete['version'])) {
             $obj = new self();
             $obj->version = $concrete['version'];
             $obj->identifier = $dir;

diff --git a/concrete/src/Updater/Migrations/Migrations/Version20231207100748.php b/concrete/src/Updater/Migrations/Migrations/Version20231207100748.php
@@ -0,0 +1,25 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Concrete\Core\Updater\Migrations\Migrations;
+
+use Concrete\Core\Entity\Announcement\AnnouncementUserView;
+use Concrete\Core\Updater\Migrations\AbstractMigration;
+use Concrete\Core\Updater\Migrations\RepeatableMigrationInterface;
+
+final class Version20231207100748 extends AbstractMigration implements RepeatableMigrationInterface
+{
+    /**
+     * {@inheritdoc}
+     *
+     * @see \Concrete\Core\Updater\Migrations\AbstractMigration::upgradeDatabase()
+     */
+    public function upgradeDatabase()
+    {
+        $this->refreshEntities([
+            // Fix deleting rows in UserFavoriteFolders table when deleting a user.
+            AnnouncementUserView::class,
+        ]);
+    }
+}