Skip to content

Commit 3ba1f56

Browse files
Merge pull request #1141 from cloudinary/develop
3.3.1 (develop to uat 2)
2 parents 94f53ed + 19ff8c2 commit 3ba1f56

File tree

3 files changed

+70
-44
lines changed

3 files changed

+70
-44
lines changed

languages/cloudinary.pot

Lines changed: 41 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ msgid ""
44
msgstr ""
55
"Project-Id-Version: Cloudinary STABLETAG\n"
66
"Report-Msgid-Bugs-To: https://github.com/cloudinary/cloudinary_wordpress\n"
7-
"POT-Creation-Date: 2026-02-02 12:12:12+00:00\n"
7+
"POT-Creation-Date: 2026-02-05 08:29:24+00:00\n"
88
"MIME-Version: 1.0\n"
99
"Content-Type: text/plain; charset=utf-8\n"
1010
"Content-Transfer-Encoding: 8bit\n"
@@ -63,11 +63,11 @@ msgstr[1] ""
6363
msgid "No items found."
6464
msgstr ""
6565

66-
#: php/cache/class-cache-point.php:961 php/class-assets.php:1265
66+
#: php/cache/class-cache-point.php:961 php/class-assets.php:1292
6767
msgid "Cloudinary Asset"
6868
msgstr ""
6969

70-
#: php/cache/class-cache-point.php:962 php/class-assets.php:1266
70+
#: php/cache/class-cache-point.php:962 php/class-assets.php:1293
7171
msgid "Post type to represent a non-media library asset."
7272
msgstr ""
7373

@@ -87,114 +87,114 @@ msgstr ""
8787
msgid "Enable Cloudinary status"
8888
msgstr ""
8989

90-
#: php/class-assets.php:818
90+
#: php/class-assets.php:845
9191
msgid "Caching"
9292
msgstr ""
9393

94-
#: php/class-assets.php:829
94+
#: php/class-assets.php:856
9595
msgid "Creating shadow assets"
9696
msgstr ""
9797

98-
#: php/class-assets.php:840
98+
#: php/class-assets.php:867
9999
msgid "Updating asset storage"
100100
msgstr ""
101101

102-
#: php/class-assets.php:1309
102+
#: php/class-assets.php:1336
103103
msgid "Additional Asset Sync Settings"
104104
msgstr ""
105105

106-
#: php/class-assets.php:1329
106+
#: php/class-assets.php:1356
107107
msgid "Additional asset sync settings"
108108
msgstr ""
109109

110-
#: php/class-assets.php:1330
110+
#: php/class-assets.php:1357
111111
msgid ""
112112
"Enabling additional asset syncing will sync the toggled assets with "
113113
"Cloudinary to make use of advanced optimization and CDN delivery "
114114
"functionality."
115115
msgstr ""
116116

117-
#: php/class-assets.php:1331
117+
#: php/class-assets.php:1358
118118
msgid "Enable additional asset syncing"
119119
msgstr ""
120120

121-
#: php/class-assets.php:1370
121+
#: php/class-assets.php:1397
122122
msgid "External Asset Sync Settings"
123123
msgstr ""
124124

125-
#: php/class-assets.php:1419 php/class-cache.php:617
125+
#: php/class-assets.php:1446 php/class-cache.php:617
126126
msgid "Plugin"
127127
msgstr ""
128128

129-
#: php/class-assets.php:1455 php/class-cache.php:793
129+
#: php/class-assets.php:1482 php/class-cache.php:793
130130
msgid "Plugins"
131131
msgstr ""
132132

133-
#: php/class-assets.php:1473 php/class-cache.php:810
133+
#: php/class-assets.php:1500 php/class-cache.php:810
134134
msgid "Deliver assets from all plugin folders"
135135
msgstr ""
136136

137-
#: php/class-assets.php:1505 php/class-cache.php:653
137+
#: php/class-assets.php:1532 php/class-cache.php:653
138138
msgid "Theme"
139139
msgstr ""
140140

141-
#: php/class-assets.php:1537 php/class-cache.php:844
141+
#: php/class-assets.php:1564 php/class-cache.php:844
142142
msgid "Themes"
143143
msgstr ""
144144

145-
#: php/class-assets.php:1555 php/class-cache.php:861
145+
#: php/class-assets.php:1582 php/class-cache.php:861
146146
msgid "Deliver all assets from active theme."
147147
msgstr ""
148148

149-
#: php/class-assets.php:1580 php/class-assets.php:1615 php/class-cache.php:685
149+
#: php/class-assets.php:1607 php/class-assets.php:1642 php/class-cache.php:685
150150
#: php/class-cache.php:896
151151
msgid "WordPress"
152152
msgstr ""
153153

154-
#: php/class-assets.php:1589 php/class-cache.php:669
154+
#: php/class-assets.php:1616 php/class-cache.php:669
155155
msgid "WordPress Admin"
156156
msgstr ""
157157

158-
#: php/class-assets.php:1596 php/class-cache.php:676
158+
#: php/class-assets.php:1623 php/class-cache.php:676
159159
msgid "WordPress Includes"
160160
msgstr ""
161161

162-
#: php/class-assets.php:1633 php/class-cache.php:913
162+
#: php/class-assets.php:1660 php/class-cache.php:913
163163
msgid "Deliver all assets from WordPress core."
164164
msgstr ""
165165

166-
#: php/class-assets.php:1659 php/class-assets.php:1685 php/class-cache.php:709
166+
#: php/class-assets.php:1686 php/class-assets.php:1712 php/class-cache.php:709
167167
#: php/class-cache.php:948
168168
msgid "Content"
169169
msgstr ""
170170

171-
#: php/class-assets.php:1666 php/class-cache.php:700
171+
#: php/class-assets.php:1693 php/class-cache.php:700
172172
msgid "Uploads"
173173
msgstr ""
174174

175-
#: php/class-assets.php:1703 php/class-cache.php:965
175+
#: php/class-assets.php:1730 php/class-cache.php:965
176176
msgid "Deliver all content assets from WordPress Media Library."
177177
msgstr ""
178178

179-
#: php/class-assets.php:1727
179+
#: php/class-assets.php:1754
180180
msgid "Enable external assets"
181181
msgstr ""
182182

183-
#: php/class-assets.php:1728
183+
#: php/class-assets.php:1755
184184
msgid ""
185185
"Enabling external assets allows you to sync assets from specific external "
186186
"sources with Cloudinary."
187187
msgstr ""
188188

189-
#: php/class-assets.php:1738
189+
#: php/class-assets.php:1765
190190
msgid "Domains for each external source."
191191
msgstr ""
192192

193-
#: php/class-assets.php:1741
193+
#: php/class-assets.php:1768
194194
msgid "Enter a domain"
195195
msgstr ""
196196

197-
#: php/class-assets.php:1742
197+
#: php/class-assets.php:1769
198198
msgid "Press ENTER or SPACE or type comma or tab to continue."
199199
msgstr ""
200200

@@ -521,49 +521,49 @@ msgstr ""
521521
msgid "Cloudinary"
522522
msgstr ""
523523

524-
#: php/class-media.php:2426
524+
#: php/class-media.php:2425
525525
msgid "The delivery for this asset is disabled."
526526
msgstr ""
527527

528-
#: php/class-media.php:2430
528+
#: php/class-media.php:2429
529529
msgid "Not syncable. This is an external media."
530530
msgstr ""
531531

532-
#: php/class-media.php:2434
532+
#: php/class-media.php:2433
533533
msgid "This media is Fetch type."
534534
msgstr ""
535535

536-
#: php/class-media.php:2438
536+
#: php/class-media.php:2437
537537
msgid "This media is Sprite type."
538538
msgstr ""
539539

540-
#: php/class-media.php:2448
540+
#: php/class-media.php:2447
541541
msgid "Not Synced"
542542
msgstr ""
543543

544-
#: php/class-media.php:2453
544+
#: php/class-media.php:2452
545545
msgid "Synced"
546546
msgstr ""
547547

548-
#: php/class-media.php:3112
548+
#: php/class-media.php:3111
549549
msgid "No Cloudinary filters"
550550
msgstr ""
551551

552-
#: php/class-media.php:3212
552+
#: php/class-media.php:3211
553553
msgid "Media Settings"
554554
msgstr ""
555555

556-
#: php/class-media.php:3215
556+
#: php/class-media.php:3214
557557
msgid "Media Display"
558558
msgstr ""
559559

560-
#: php/class-media.php:3219 php/ui/component/class-plan-details.php:119
560+
#: php/class-media.php:3218 php/ui/component/class-plan-details.php:119
561561
#: php/ui/component/class-plan-status.php:128
562562
#: ui-definitions/settings-pages.php:568 ui-definitions/settings-sidebar.php:44
563563
msgid "Transformations"
564564
msgstr ""
565565

566-
#: php/class-media.php:3220
566+
#: php/class-media.php:3219
567567
msgid ""
568568
"Cloudinary allows you to easily transform your images on-the-fly to any "
569569
"required format, style and dimension, and also optimizes images for minimal "
@@ -572,7 +572,7 @@ msgid ""
572572
"transformation and delivery URLs."
573573
msgstr ""
574574

575-
#: php/class-media.php:3225 ui-definitions/settings-image.php:174
575+
#: php/class-media.php:3224 ui-definitions/settings-image.php:174
576576
#: ui-definitions/settings-pages.php:594 ui-definitions/settings-video.php:260
577577
msgid "See examples"
578578
msgstr ""

php/class-assets.php

Lines changed: 28 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -494,18 +494,37 @@ protected function activate_parents() {
494494
}
495495
}
496496
}
497-
498497
// Get the disabled items.
499498
foreach ( $this->asset_parents as $url => $parent ) {
500499
if ( isset( $this->active_parents[ $url ] ) ) {
501500
continue;
502501
}
502+
503+
if ( ! $this->is_post_cloudinary_asset( $parent->ID ) ) {
504+
continue;
505+
}
506+
503507
$this->purge_parent( $parent->ID );
504508
// Remove parent.
505509
wp_delete_post( $parent->ID );
506510
}
507511
}
508512

513+
/**
514+
* Check if a post is a Cloudinary asset.
515+
*
516+
* @param int $post_id The post ID to check.
517+
*
518+
* @return bool
519+
*/
520+
public function is_post_cloudinary_asset( $post_id ) {
521+
if ( get_post_type( $post_id ) === self::POST_TYPE_SLUG ) {
522+
return true;
523+
}
524+
525+
return false;
526+
}
527+
509528
/**
510529
* Activate a parent asset path.
511530
*
@@ -569,6 +588,10 @@ public function create_asset_parent( $path, $version ) {
569588
* @param callable $callback The callback function to execute on each post.
570589
*/
571590
private function process_parent_assets( $parent_id, $callback ) {
591+
if ( ! $this->is_post_cloudinary_asset( $parent_id ) ) {
592+
return;
593+
}
594+
572595
$query_args = array(
573596
'post_type' => self::POST_TYPE_SLUG,
574597
'posts_per_page' => 100,
@@ -626,6 +649,10 @@ public function purge_parent( $parent_id ) {
626649
$this->process_parent_assets(
627650
$parent_id,
628651
function ( $post_id ) {
652+
if ( ! $this->is_post_cloudinary_asset( $post_id ) ) {
653+
return;
654+
}
655+
629656
wp_delete_post( $post_id );
630657
}
631658
);

php/class-media.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2285,8 +2285,7 @@ function ( $value, $key ) use ( &$asset ) {
22852285
*/
22862286
public function down_sync_asset() {
22872287
$nonce = Utils::get_sanitized_text( 'nonce', INPUT_POST );
2288-
if ( wp_verify_nonce( $nonce, 'wp_rest' ) ) {
2289-
2288+
if ( is_user_logged_in() && wp_verify_nonce( $nonce, 'wp_rest' ) && current_user_can( 'upload_files' ) ) {
22902289
$asset = $this->get_asset_payload();
22912290
// Set a base array for pulling an asset if needed.
22922291
$base_return = array(

0 commit comments

Comments
 (0)