Changeset 3446555

Timestamp:

01/25/2026 02:10:05 PM (3 weeks ago)

Author:

coozywana

Message:

Update to version 2.2.1 from GitHub

Location:

staticdelivr

Files:

• tags/2.2.1 (copied) (copied from staticdelivr/trunk)
• tags/2.2.1/README.txt (modified) (2 diffs)
• tags/2.2.1/includes/class-staticdelivr-images.php (modified) (2 diffs)
• trunk/README.txt (modified) (2 diffs)
• trunk/includes/class-staticdelivr-images.php (modified) (2 diffs)

staticdelivr/tags/2.2.1/README.txt

@@ -240 +240 @@
 == Changelog ==
 
+= 2.2.1 =
+* Fixed an issue with infinite recursion in the `rewrite_attachment_image_src` and `rewrite_attachment_url` filters.
+* Improved handling of image URLs to prevent errors when retrieving attachment URLs.
+
 = 2.2.0 =
 * **Fixed: Critical Bug** - Improved recovery for malformed CDN URLs by looking up original attachment paths in the database instead of guessing dates
@@ -380 +384 @@
 == Upgrade Notice ==
 
+= 2.2.1 =
+Fixes infinite recursion in image URL filters and improves handling of attachment URLs.
+
 = 2.2.0 =
 Critical fix: Solves broken images issues by correctly recovering original file paths from the database for older content.

staticdelivr/tags/2.2.1/includes/class-staticdelivr-images.php

@@ -542 +542 @@
 
         if ($attachment_id) {
+            // Prevent infinite recursion: Temporarily remove our own filters
+            // because wp_get_attachment_image_src triggers the 'wp_get_attachment_image_src' filter
+            // which calls our rewrite_attachment_image_src() -> build_image_cdn_url() -> this function!
+            remove_filter('wp_get_attachment_image_src', array($this, 'rewrite_attachment_image_src'), 10);
+            remove_filter('wp_get_attachment_url', array($this, 'rewrite_attachment_url'), 10);
+
+            $original_url = false;
+
             // Check if we need a specific size.
             if ($filename !== $base_filename && preg_match('/-(\d+)x(\d+)(\.[^.]+)$/', $filename, $matches)) {
@@ -548 +556 @@
                 $image_src = wp_get_attachment_image_src($attachment_id, array($width, $height));
                 if ($image_src && isset($image_src[0])) {
-                    return $image_src[0];
+                    $original_url = $image_src[0];
                 }
             }
 
-            return wp_get_attachment_url($attachment_id);
+            if (!$original_url) {
+                $original_url = wp_get_attachment_url($attachment_id);
+            }
+
+            // Restore filters
+            add_filter('wp_get_attachment_image_src', array($this, 'rewrite_attachment_image_src'), 10, 4);
+            add_filter('wp_get_attachment_url', array($this, 'rewrite_attachment_url'), 10, 2);
+
+            return $original_url;
         }
 

staticdelivr/trunk/README.txt

@@ -240 +240 @@
 == Changelog ==
 
+= 2.2.1 =
+* Fixed an issue with infinite recursion in the `rewrite_attachment_image_src` and `rewrite_attachment_url` filters.
+* Improved handling of image URLs to prevent errors when retrieving attachment URLs.
+
 = 2.2.0 =
 * **Fixed: Critical Bug** - Improved recovery for malformed CDN URLs by looking up original attachment paths in the database instead of guessing dates
@@ -380 +384 @@
 == Upgrade Notice ==
 
+= 2.2.1 =
+Fixes infinite recursion in image URL filters and improves handling of attachment URLs.
+
 = 2.2.0 =
 Critical fix: Solves broken images issues by correctly recovering original file paths from the database for older content.

staticdelivr/trunk/includes/class-staticdelivr-images.php

@@ -542 +542 @@
 
         if ($attachment_id) {
+            // Prevent infinite recursion: Temporarily remove our own filters
+            // because wp_get_attachment_image_src triggers the 'wp_get_attachment_image_src' filter
+            // which calls our rewrite_attachment_image_src() -> build_image_cdn_url() -> this function!
+            remove_filter('wp_get_attachment_image_src', array($this, 'rewrite_attachment_image_src'), 10);
+            remove_filter('wp_get_attachment_url', array($this, 'rewrite_attachment_url'), 10);
+
+            $original_url = false;
+
             // Check if we need a specific size.
             if ($filename !== $base_filename && preg_match('/-(\d+)x(\d+)(\.[^.]+)$/', $filename, $matches)) {
@@ -548 +556 @@
                 $image_src = wp_get_attachment_image_src($attachment_id, array($width, $height));
                 if ($image_src && isset($image_src[0])) {
-                    return $image_src[0];
+                    $original_url = $image_src[0];
                 }
             }
 
-            return wp_get_attachment_url($attachment_id);
+            if (!$original_url) {
+                $original_url = wp_get_attachment_url($attachment_id);
+            }
+
+            // Restore filters
+            add_filter('wp_get_attachment_image_src', array($this, 'rewrite_attachment_image_src'), 10, 4);
+            add_filter('wp_get_attachment_url', array($this, 'rewrite_attachment_url'), 10, 2);
+
+            return $original_url;
         }