regression fix generic FB/TW images for blog/news/filedownload post w…

…/o specific FB/TW image attached
exponentcms · May 17, 2022 · bd775a4 · bd775a4
1 parent 9fc6633
commit bd775a4
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/framework/modules/blog/controllers/blogController.php b/framework/modules/blog/controllers/blogController.php
@@ -372,8 +372,8 @@ public function meta_fb($request, $object, $canonical) {
         $metainfo['url'] = empty($object->meta_fb['url']) ? $canonical : $object->meta_fb['url'];
         $metainfo['image'] = empty($object->meta_fb['fbimage'][0]) ? '' : $object->meta_fb['fbimage'][0]->url;
         if (empty($metainfo['image'])) {
-            if (!empty($object->expFile['files'][0]->is_image)) {
-                $metainfo['image'] = $object->expFile['files'][0]->url;
+            if (!empty($object->expFile[0]->is_image)) {
+                $metainfo['image'] = $object->expFile[0]->url;
             } else {
                 $config = expConfig::getConfig($object->location_data);
                 if (!empty($config['expFile']['fbimage'][0]))
@@ -414,8 +414,8 @@ public function meta_tw($request, $object, $canonical) {
         $metainfo['description'] = substr(empty($object->meta_tw['description']) ? $desc : $object->meta_tw['description'], 0, 199);
         $metainfo['image'] = empty($object->meta_tw['twimage'][0]) ? '' : $object->meta_tw['twimage'][0]->url;
         if (empty($metainfo['image'])) {
-            if (!empty($object->expFile['images'][0]->is_image)) {
-                $metainfo['image'] = $object->expFile['images'][0]->url;
+            if (!empty($object->expFile[0]->is_image)) {
+                $metainfo['image'] = $object->expFile[0]->url;
             } else {
                 if (!empty($config['expFile']['twimage'][0]))
                     $file = new expFile($config['expFile']['twimage'][0]);

diff --git a/framework/modules/filedownloads/controllers/filedownloadController.php b/framework/modules/filedownloads/controllers/filedownloadController.php
@@ -123,7 +123,7 @@ public function downloadfile() {
      * @return string
      */
     function meta_rich($request, $object) {
-        if (!empty($object->expFile[0]) && file_exists(BASE.$object->expFile[0]->directory.$object->expFile[0]->filename)) {
+        if (!empty($object->expFile['downloadable'][0]) && file_exists(BASE.$object->expFile['downloadable'][0]->directory.$object->expFile[0]->filename)) {
             $rich_meta = '<!--
         <PageMap>
             <DataObject type="action">
@@ -209,8 +209,8 @@ public function meta_tw($request, $object, $canonical) {
         $metainfo['description'] = substr(empty($object->meta_tw['description']) ? $desc : $object->meta_tw['description'], 0, 199);
         $metainfo['image'] = empty($object->meta_tw['twimage'][0]) ? '' : $object->meta_tw['twimage'][0]->url;
         if (empty($metainfo['image'])) {
-            if (!empty($object->expFile['images'][0]->is_image)) {
-                $metainfo['image'] = $object->expFile['images'][0]->url;
+            if (!empty($object->expFile['downloadable'][0]->is_image)) {
+                $metainfo['image'] = $object->expFile['downloadable'][0]->url;
             } else {
                 if (!empty($config['expFile']['twimage'][0]))
                     $file = new expFile($config['expFile']['twimage'][0]);

diff --git a/framework/modules/news/controllers/newsController.php b/framework/modules/news/controllers/newsController.php
@@ -375,8 +375,8 @@ public function meta_fb($request, $object, $canonical) {
         $metainfo['url'] = empty($object->meta_fb['url']) ? $canonical : $object->meta_fb['url'];
         $metainfo['image'] = empty($object->meta_fb['fbimage'][0]) ? '' : $object->meta_fb['fbimage'][0]->url;
         if (empty($metainfo['image'])) {
-            if (!empty($object->expFile['images'][0]->is_image)) {
-                $metainfo['image'] = $object->expFile['images'][0]->url;
+            if (!empty($object->expFile[0]->is_image)) {
+                $metainfo['image'] = $object->expFile[0]->url;
             } else {
                 $config = expConfig::getConfig($object->location_data);
                 if (!empty($config['expFile']['fbimage'][0]))
@@ -417,8 +417,8 @@ public function meta_tw($request, $object, $canonical) {
         $metainfo['description'] = substr(empty($object->meta_tw['description']) ? $desc : $object->meta_tw['description'], 0, 199);
         $metainfo['image'] = empty($object->meta_tw['twimage'][0]) ? '' : $object->meta_tw['twimage'][0]->url;
         if (empty($metainfo['image'])) {
-            if (!empty($object->expFile['images'][0]->is_image)) {
-                $metainfo['image'] = $object->expFile['images'][0]->url;
+            if (!empty($object->expFile[0]->is_image)) {
+                $metainfo['image'] = $object->expFile[0]->url;
             } else {
                 if (!empty($config['expFile']['twimage'][0]))
                     $file = new expFile($config['expFile']['twimage'][0]);