Fix for issue 712

udx · May 10, 2024 · 47b32ca · 47b32ca
1 parent 102791a
commit 47b32ca
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 16 deletions.
diff --git a/lib/classes/class-sync-non-media.php b/lib/classes/class-sync-non-media.php
@@ -142,12 +142,16 @@ public function sync_file($name, $absolutePath, $forced = false, $args = array()
              * @return media object
              */
             try {
-              $media = $object->update(array('metadata' => $args['metadata']) +
-                array(
-                  'cacheControl' => apply_filters('sm:item:cacheControl', ud_get_stateless_media()->get_default_cache_control(), $absolutePath),
-                  'predefinedAcl' => 'publicRead',
-                  'contentDisposition' => apply_filters('sm:item:contentDisposition', null, $absolutePath)
-                ));
+              $mediaOptions = array(
+                'cacheControl' => apply_filters('sm:item:cacheControl', ud_get_stateless_media()->get_default_cache_control(), $absolutePath),
+                'contentDisposition' => apply_filters('sm:item:contentDisposition', null, $absolutePath)
+              );
+
+              if ( !defined('WP_STATELESS_SKIP_ACL_SET') || !WP_STATELESS_SKIP_ACL_SET) {
+                $mediaOptions['predefinedAcl'] = 'publicRead';
+              }
+
+              $media = $object->update(array('metadata' => $args['metadata']) + $mediaOptions);
             } catch (\Throwable $th) {
               //throw $th;
             }

diff --git a/lib/classes/class-utility.php b/lib/classes/class-utility.php
@@ -272,9 +272,6 @@ public static function add_media($metadata, $attachment_id, $force = false, $arg
 
           $image_sizes = self::get_path_and_url($metadata, $attachment_id);
 
-          Helper::debug( '$image_sizes: ' );
-          Helper::debug( json_encode($image_sizes) );
-
           foreach ($image_sizes as $size => $img) {
             if ((isset($_REQUEST['size']) && $_REQUEST['size'] == $size) || empty($_REQUEST['size'])) {
               // GCS metadata
@@ -330,12 +327,16 @@ public static function add_media($metadata, $attachment_id, $force = false, $arg
                  * @return media object
                  */
                 try {
-                  $media = $object->update(array('metadata' => $media_args['metadata']) +
-                    array(
-                      'cacheControl' => $_cacheControl,
-                      'predefinedAcl' => 'publicRead',
-                      'contentDisposition' => $_contentDisposition
-                    ));
+                  $mediaOptions = array(
+                    'cacheControl' => $_cacheControl,
+                    'contentDisposition' => $_contentDisposition
+                  );
+
+                  if ( !defined('WP_STATELESS_SKIP_ACL_SET') || !WP_STATELESS_SKIP_ACL_SET) {
+                    $mediaOptions['predefinedAcl'] = 'publicRead';
+                  }
+
+                  $media = $object->update(array('metadata' => $media_args['metadata']) + $mediaOptions);
 
                   Helper::debug( '$media: ' );
                   Helper::debug( json_encode($media) );
@@ -455,7 +456,6 @@ public static function get_path_and_url($metadata, $attachment_id) {
               $metadata['height'] = $_image_size[1];
             }
           } catch (\Exception $e) {
-            Helper::debug($e->getMessage());
             // lets do nothing.
           }
         }