Skip to content

Commit 10d3947

Browse files
AugustMillerAugustMiller
committed
Merge remote-tracking branch 'origin/main'
2 parents 363d390 + 3a9d9cb commit 10d3947

File tree

4 files changed

+37
-37
lines changed

4 files changed

+37
-37
lines changed

‎docs/.artifacts/cms/4.x/config-general.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ Since
189189
: 3.5.6
190190

191191
Deprecated
192-
: in 4.0.0
192+
: in 4.0.0 <Icon kind="danger" style="color: var(--craft-red)" />
193193

194194
</div>
195195

@@ -1159,7 +1159,7 @@ Since
11591159
: 3.6.14
11601160
11611161
Deprecated
1162-
: in 4.11.0. [[\craft\filters\Headers]] should be used instead.
1162+
: in 4.11.0. [[\craft\filters\Headers]] should be used instead. <Icon kind="danger" style="color: var(--craft-red)" />
11631163
11641164
</div>
11651165
@@ -3187,7 +3187,7 @@ Since
31873187
: 3.5.0
31883188
31893189
Deprecated
3190-
: in 4.13.0. [[\craft\filters\BasicHttpAuthLogin]] should be used instead.
3190+
: in 4.13.0. [[\craft\filters\BasicHttpAuthLogin]] should be used instead. <Icon kind="danger" style="color: var(--craft-red)" />
31913191
31923192
</div>
31933193
@@ -4471,7 +4471,7 @@ Since
44714471
: 3.5.0
44724472
44734473
Deprecated
4474-
: in 4.11.0. [[\craft\filters\Cors]] should be used instead.
4474+
: in 4.11.0. [[\craft\filters\Cors]] should be used instead. <Icon kind="danger" style="color: var(--craft-red)" />
44754475
44764476
</div>
44774477

‎docs/.artifacts/cms/4.x/events.json

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -26205,19 +26205,19 @@
2620526205
"class": "craft\\elements\\db\\AddressQuery",
2620626206
"name": "EVENT_BEFORE_POPULATE_ELEMENT",
2620726207
"type": "craft\\events\\PopulateElementEvent",
26208-
"desc": "The event that is triggered before an element is populated."
26208+
"desc": "The event that is triggered before an element is populated from a database row."
2620926209
},
2621026210
{
2621126211
"class": "craft\\elements\\db\\AddressQuery",
2621226212
"name": "EVENT_AFTER_POPULATE_ELEMENT",
2621326213
"type": "craft\\events\\PopulateElementEvent",
26214-
"desc": "The event that is triggered after an element is populated."
26214+
"desc": "The event that is triggered after an element is populated from a database row."
2621526215
},
2621626216
{
2621726217
"class": "craft\\elements\\db\\AddressQuery",
2621826218
"name": "EVENT_AFTER_POPULATE_ELEMENTS",
2621926219
"type": "craft\\events\\PopulateElementEvent",
26220-
"desc": "The event that is triggered after an element is populated."
26220+
"desc": "The event triggered after all elements are populated."
2622126221
},
2622226222
{
2622326223
"class": "craft\\elements\\db\\AddressQuery",
@@ -26253,19 +26253,19 @@
2625326253
"class": "craft\\elements\\db\\AssetQuery",
2625426254
"name": "EVENT_BEFORE_POPULATE_ELEMENT",
2625526255
"type": "craft\\events\\PopulateElementEvent",
26256-
"desc": "The event that is triggered before an element is populated."
26256+
"desc": "The event that is triggered before an element is populated from a database row."
2625726257
},
2625826258
{
2625926259
"class": "craft\\elements\\db\\AssetQuery",
2626026260
"name": "EVENT_AFTER_POPULATE_ELEMENT",
2626126261
"type": "craft\\events\\PopulateElementEvent",
26262-
"desc": "The event that is triggered after an element is populated."
26262+
"desc": "The event that is triggered after an element is populated from a database row."
2626326263
},
2626426264
{
2626526265
"class": "craft\\elements\\db\\AssetQuery",
2626626266
"name": "EVENT_AFTER_POPULATE_ELEMENTS",
2626726267
"type": "craft\\events\\PopulateElementEvent",
26268-
"desc": "The event that is triggered after an element is populated."
26268+
"desc": "The event triggered after all elements are populated."
2626926269
},
2627026270
{
2627126271
"class": "craft\\elements\\db\\AssetQuery",
@@ -26301,19 +26301,19 @@
2630126301
"class": "craft\\elements\\db\\CategoryQuery",
2630226302
"name": "EVENT_BEFORE_POPULATE_ELEMENT",
2630326303
"type": "craft\\events\\PopulateElementEvent",
26304-
"desc": "The event that is triggered before an element is populated."
26304+
"desc": "The event that is triggered before an element is populated from a database row."
2630526305
},
2630626306
{
2630726307
"class": "craft\\elements\\db\\CategoryQuery",
2630826308
"name": "EVENT_AFTER_POPULATE_ELEMENT",
2630926309
"type": "craft\\events\\PopulateElementEvent",
26310-
"desc": "The event that is triggered after an element is populated."
26310+
"desc": "The event that is triggered after an element is populated from a database row."
2631126311
},
2631226312
{
2631326313
"class": "craft\\elements\\db\\CategoryQuery",
2631426314
"name": "EVENT_AFTER_POPULATE_ELEMENTS",
2631526315
"type": "craft\\events\\PopulateElementEvent",
26316-
"desc": "The event that is triggered after an element is populated."
26316+
"desc": "The event triggered after all elements are populated."
2631726317
},
2631826318
{
2631926319
"class": "craft\\elements\\db\\CategoryQuery",
@@ -26349,19 +26349,19 @@
2634926349
"class": "craft\\elements\\db\\ElementQuery",
2635026350
"name": "EVENT_BEFORE_POPULATE_ELEMENT",
2635126351
"type": "craft\\events\\PopulateElementEvent",
26352-
"desc": "The event that is triggered before an element is populated."
26352+
"desc": "The event that is triggered before an element is populated from a database row."
2635326353
},
2635426354
{
2635526355
"class": "craft\\elements\\db\\ElementQuery",
2635626356
"name": "EVENT_AFTER_POPULATE_ELEMENT",
2635726357
"type": "craft\\events\\PopulateElementEvent",
26358-
"desc": "The event that is triggered after an element is populated."
26358+
"desc": "The event that is triggered after an element is populated from a database row."
2635926359
},
2636026360
{
2636126361
"class": "craft\\elements\\db\\ElementQuery",
2636226362
"name": "EVENT_AFTER_POPULATE_ELEMENTS",
2636326363
"type": "craft\\events\\PopulateElementEvent",
26364-
"desc": "The event that is triggered after an element is populated."
26364+
"desc": "The event triggered after all elements are populated."
2636526365
},
2636626366
{
2636726367
"class": "craft\\elements\\db\\ElementQuery",
@@ -26397,19 +26397,19 @@
2639726397
"class": "craft\\elements\\db\\EntryQuery",
2639826398
"name": "EVENT_BEFORE_POPULATE_ELEMENT",
2639926399
"type": "craft\\events\\PopulateElementEvent",
26400-
"desc": "The event that is triggered before an element is populated."
26400+
"desc": "The event that is triggered before an element is populated from a database row."
2640126401
},
2640226402
{
2640326403
"class": "craft\\elements\\db\\EntryQuery",
2640426404
"name": "EVENT_AFTER_POPULATE_ELEMENT",
2640526405
"type": "craft\\events\\PopulateElementEvent",
26406-
"desc": "The event that is triggered after an element is populated."
26406+
"desc": "The event that is triggered after an element is populated from a database row."
2640726407
},
2640826408
{
2640926409
"class": "craft\\elements\\db\\EntryQuery",
2641026410
"name": "EVENT_AFTER_POPULATE_ELEMENTS",
2641126411
"type": "craft\\events\\PopulateElementEvent",
26412-
"desc": "The event that is triggered after an element is populated."
26412+
"desc": "The event triggered after all elements are populated."
2641326413
},
2641426414
{
2641526415
"class": "craft\\elements\\db\\EntryQuery",
@@ -26445,19 +26445,19 @@
2644526445
"class": "craft\\elements\\db\\GlobalSetQuery",
2644626446
"name": "EVENT_BEFORE_POPULATE_ELEMENT",
2644726447
"type": "craft\\events\\PopulateElementEvent",
26448-
"desc": "The event that is triggered before an element is populated."
26448+
"desc": "The event that is triggered before an element is populated from a database row."
2644926449
},
2645026450
{
2645126451
"class": "craft\\elements\\db\\GlobalSetQuery",
2645226452
"name": "EVENT_AFTER_POPULATE_ELEMENT",
2645326453
"type": "craft\\events\\PopulateElementEvent",
26454-
"desc": "The event that is triggered after an element is populated."
26454+
"desc": "The event that is triggered after an element is populated from a database row."
2645526455
},
2645626456
{
2645726457
"class": "craft\\elements\\db\\GlobalSetQuery",
2645826458
"name": "EVENT_AFTER_POPULATE_ELEMENTS",
2645926459
"type": "craft\\events\\PopulateElementEvent",
26460-
"desc": "The event that is triggered after an element is populated."
26460+
"desc": "The event triggered after all elements are populated."
2646126461
},
2646226462
{
2646326463
"class": "craft\\elements\\db\\GlobalSetQuery",
@@ -26493,19 +26493,19 @@
2649326493
"class": "craft\\elements\\db\\MatrixBlockQuery",
2649426494
"name": "EVENT_BEFORE_POPULATE_ELEMENT",
2649526495
"type": "craft\\events\\PopulateElementEvent",
26496-
"desc": "The event that is triggered before an element is populated."
26496+
"desc": "The event that is triggered before an element is populated from a database row."
2649726497
},
2649826498
{
2649926499
"class": "craft\\elements\\db\\MatrixBlockQuery",
2650026500
"name": "EVENT_AFTER_POPULATE_ELEMENT",
2650126501
"type": "craft\\events\\PopulateElementEvent",
26502-
"desc": "The event that is triggered after an element is populated."
26502+
"desc": "The event that is triggered after an element is populated from a database row."
2650326503
},
2650426504
{
2650526505
"class": "craft\\elements\\db\\MatrixBlockQuery",
2650626506
"name": "EVENT_AFTER_POPULATE_ELEMENTS",
2650726507
"type": "craft\\events\\PopulateElementEvent",
26508-
"desc": "The event that is triggered after an element is populated."
26508+
"desc": "The event triggered after all elements are populated."
2650926509
},
2651026510
{
2651126511
"class": "craft\\elements\\db\\MatrixBlockQuery",
@@ -26541,19 +26541,19 @@
2654126541
"class": "craft\\elements\\db\\TagQuery",
2654226542
"name": "EVENT_BEFORE_POPULATE_ELEMENT",
2654326543
"type": "craft\\events\\PopulateElementEvent",
26544-
"desc": "The event that is triggered before an element is populated."
26544+
"desc": "The event that is triggered before an element is populated from a database row."
2654526545
},
2654626546
{
2654726547
"class": "craft\\elements\\db\\TagQuery",
2654826548
"name": "EVENT_AFTER_POPULATE_ELEMENT",
2654926549
"type": "craft\\events\\PopulateElementEvent",
26550-
"desc": "The event that is triggered after an element is populated."
26550+
"desc": "The event that is triggered after an element is populated from a database row."
2655126551
},
2655226552
{
2655326553
"class": "craft\\elements\\db\\TagQuery",
2655426554
"name": "EVENT_AFTER_POPULATE_ELEMENTS",
2655526555
"type": "craft\\events\\PopulateElementEvent",
26556-
"desc": "The event that is triggered after an element is populated."
26556+
"desc": "The event triggered after all elements are populated."
2655726557
},
2655826558
{
2655926559
"class": "craft\\elements\\db\\TagQuery",
@@ -26589,19 +26589,19 @@
2658926589
"class": "craft\\elements\\db\\UserQuery",
2659026590
"name": "EVENT_BEFORE_POPULATE_ELEMENT",
2659126591
"type": "craft\\events\\PopulateElementEvent",
26592-
"desc": "The event that is triggered before an element is populated."
26592+
"desc": "The event that is triggered before an element is populated from a database row."
2659326593
},
2659426594
{
2659526595
"class": "craft\\elements\\db\\UserQuery",
2659626596
"name": "EVENT_AFTER_POPULATE_ELEMENT",
2659726597
"type": "craft\\events\\PopulateElementEvent",
26598-
"desc": "The event that is triggered after an element is populated."
26598+
"desc": "The event that is triggered after an element is populated from a database row."
2659926599
},
2660026600
{
2660126601
"class": "craft\\elements\\db\\UserQuery",
2660226602
"name": "EVENT_AFTER_POPULATE_ELEMENTS",
2660326603
"type": "craft\\events\\PopulateElementEvent",
26604-
"desc": "The event that is triggered after an element is populated."
26604+
"desc": "The event triggered after all elements are populated."
2660526605
},
2660626606
{
2660726607
"class": "craft\\elements\\db\\UserQuery",

‎docs/.artifacts/cms/5.x/config-general.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ Since
189189
: 3.5.6
190190

191191
Deprecated
192-
: in 4.0.0
192+
: in 4.0.0 <Icon kind="danger" style="color: var(--craft-red)" />
193193

194194
</div>
195195

@@ -1242,7 +1242,7 @@ Since
12421242
: 3.6.14
12431243
12441244
Deprecated
1245-
: in 4.11.0. [[\craft\filters\Headers]] should be used instead.
1245+
: in 4.11.0. [[\craft\filters\Headers]] should be used instead. <Icon kind="danger" style="color: var(--craft-red)" />
12461246
12471247
</div>
12481248
@@ -3326,7 +3326,7 @@ Since
33263326
: 3.5.0
33273327
33283328
Deprecated
3329-
: in 4.13.0. [[\craft\filters\BasicHttpAuthLogin]] should be used instead.
3329+
: in 4.13.0. [[\craft\filters\BasicHttpAuthLogin]] should be used instead. <Icon kind="danger" style="color: var(--craft-red)" />
33303330
33313331
</div>
33323332
@@ -4642,7 +4642,7 @@ Since
46424642
: 3.5.0
46434643
46444644
Deprecated
4645-
: in 4.11.0. [[\craft\filters\Cors]] should be used instead.
4645+
: in 4.11.0. [[\craft\filters\Cors]] should be used instead. <Icon kind="danger" style="color: var(--craft-red)" />
46464646
46474647
</div>
46484648

‎docs/5.x/extend/utilities.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ class MyUtility extends Utility
3434
return 'my-utility';
3535
}
3636

37-
public static function iconPath(): ?string
37+
public static function icon(): ?string
3838
{
3939
return Craft::getAlias('@my-plugin/icon.svg');
4040
}
@@ -74,7 +74,7 @@ The static [`badgeCount()`](craft5:craft\base\UtilityInterface::badgeCount()) me
7474
::: warning
7575
Badge counts are calculated on every control panel request. Be mindful of your users’ experience, and cache any expensive arithmetic or database queries!
7676

77-
It’s also important to display a number that reflects items that are actionable for the current user. Suppose you wanted to list “stale” entries (things that hadn’t been edited in the last month)—showing a user a count across all sections (even if they didn’t have teh correct [permissions](#permissions)) might continue to display a badge, even when their backlog was cleared!
77+
It’s also important to display a number that reflects items that are actionable for the current user. Suppose you wanted to list “stale” entries (things that hadn’t been edited in the last month)—showing a user a count across all sections (even if they didn’t have the correct [permissions](#permissions)) might continue to display a badge, even when their backlog was cleared!
7878

7979
```php
8080
public static function badgeCount(): int

0 commit comments

Comments
 (0)