Skip to content

Commit 218a8c1

Browse files
committed
Merge branch '6.2' of github.com:WoltLab/docs.woltlab.com into 6.2
2 parents b4224a1 + a907115 commit 218a8c1

File tree

10 files changed

+16
-37
lines changed

10 files changed

+16
-37
lines changed

docs/migration/wsc60/php.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -301,7 +301,7 @@ final class FooImageFileProcessor extends AbstractFileProcessor
301301
return true;
302302
}
303303

304-
if ($fooFromCoreFile->fooID === $fooFromContext->fooID) {
304+
if ($fooFromCoreFile->fooID === $fooFromContext?->fooID) {
305305
return true;
306306
}
307307

docs/migration/wsc61/deprecations_removals.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,11 +55,15 @@ With version 6.2, we have deprecated certain components and removed several othe
5555
- `WCF.System.Worker`
5656
- `WCF.TabMenu`
5757
- `WCF.User.Profile.ActivityPointList` ([WoltLab/WCF#6119](https://github.com/WoltLab/WCF/pull/6119))
58+
- `WCF.User.Profile.TabMenu` ([WoltLab/WCF#6123](https://github.com/WoltLab/WCF/pull/6123))
5859
- `WCF.User.SignaturePreview` ([WoltLab/WCF#6114](https://github.com/WoltLab/WCF/pull/6114))
5960
- `ui.wcfSlideshow` (jQuery Widget)
6061
- `wcfTabs` (jQuery Widget)
6162
- `datepicker` (jQuery Widget)
6263
- `wcf.messageTabMenu` (jQuery Widget) ([WoltLab/WCF#6115](https://github.com/WoltLab/WCF/pull/6115/))
64+
- `WoltLabSuite/Core/Ui/User/Profile/Menu/Item/Abstract` ([WoltLab/WCF#6126](https://github.com/WoltLab/WCF/pull/6126/))
65+
- `WoltLabSuite/Core/Ui/User/Profile/Menu/Item/Follow` ([WoltLab/WCF#6126](https://github.com/WoltLab/WCF/pull/6126/))
66+
- `WoltLabSuite/Core/Ui/User/Profile/Menu/Item/Ignore` ([WoltLab/WCF#6126](https://github.com/WoltLab/WCF/pull/6126/))
6367

6468
## Removals
6569

docs/tutorial/series/part_2.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ The code for the table head is similar to the other `th` elements:
144144
For the table body’s column, we need to make sure that the birthday is only show if it is actually set:
145145

146146
```smarty
147-
<td class="columnDate columnBirthday">{if $person->birthday}{$person->birthday|strtotime|date}{/if}</td>
147+
<td class="columnDate columnBirthday">{if $person->birthday}{$person->birthday}{/if}</td>
148148
```
149149

150150

docs/view/template-modifiers.md

Lines changed: 2 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -202,40 +202,29 @@ The exact formatting depends on the current language (via the language items `wc
202202
A limited number of safe native PHP functions may also be used as variable modifiers:
203203

204204
* `abs`
205-
* `addslashes`
206-
* `array_diff`
207-
* `array_fill`
208205
* `array_key_exists`
209206
* `array_keys`
210207
* `array_pop`
211-
* `array_slice`
212208
* `array_values`
213209
* `base64_decode`
214210
* `base64_encode`
215211
* `basename`
216212
* `ceil`
217213
* `concat`
218-
* `constant`
219214
* `count`
220215
* `currency`
221216
* `current`
222217
* `date`
223218
* `defined`
224-
* `doubleval`
225219
* `empty`
226220
* `end`
227221
* `explode`
228-
* `file_exists`
229222
* `filesize`
230223
* `floatval`
231224
* `floor`
232225
* `function_exists`
233226
* `get_class`
234227
* `gmdate`
235-
* `hash`
236-
* `htmlspecialchars`
237-
* `html_entity_decode`
238-
* `http_build_query`
239228
* `implode`
240229
* `in_array`
241230
* `is_array`
@@ -247,12 +236,9 @@ A limited number of safe native PHP functions may also be used as variable modif
247236
* `intval`
248237
* `is_subclass_of`
249238
* `isset`
250-
* `json_encode`
251239
* `key`
252-
* `lcfirst`
253240
* `ltrim`
254241
* `max`
255-
* `mb_strpos`
256242
* `mb_strlen`
257243
* `mb_strpos`
258244
* `mb_strtolower`
@@ -262,9 +248,6 @@ A limited number of safe native PHP functions may also be used as variable modif
262248
* `method_exists`
263249
* `microtime`
264250
* `min`
265-
* `nl2br`
266-
* `number_format`
267-
* `parse_url`
268251
* `preg_match`
269252
* `preg_replace`
270253
* `print_r`
@@ -274,26 +257,18 @@ A limited number of safe native PHP functions may also be used as variable modif
274257
* `round`
275258
* `sha1`
276259
* `spl_object_hash`
277-
* `sprintf`
278260
* `strip_tags`
279261
* `strlen`
280-
* `strpos`
281-
* `strtolower`
282-
* `strtotime`
283-
* `strtoupper`
284262
* `str_contains`
285263
* `str_ends_with`
286-
* `str_ireplace`
287-
* `str_pad`
288264
* `str_repeat`
289265
* `str_replace`
290266
* `str_starts_with`
267+
* `strtolower`
268+
* `strtoupper`
291269
* `substr`
292270
* `trim`
293271
* `ucfirst`
294-
* `uniqid`
295-
* `urlencode`
296272
* `var_dump`
297273
* `version_compare`
298274
* `wcfDebug`
299-
* `wordwrap`

requirements.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Markdown==3.7
22
mike==2.1.3
33
mkdocs-git-revision-date-plugin==0.3.2
4-
mkdocs-macros-plugin==1.0.5
5-
mkdocs-material==9.5.39
4+
mkdocs-macros-plugin==1.3.7
5+
mkdocs-material==9.5.43
66
mkdocs==1.6.1
7-
setuptools==75.1.0
7+
setuptools==75.5.0

snippets/migration/wsc54/en_new.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<language xmlns="http://www.woltlab.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.woltlab.com http://www.woltlab.com/XSD/5.4/language.xsd" languagecode="en" languagename="English" countrycode="gb">
2+
<language xmlns="http://www.woltlab.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.woltlab.com http://www.woltlab.com/XSD/5.4/language.xsd" languagecode="en">
33
<import>
44
<category name="wcf.foo">
55
<item name="wcf.foo.bar"><![CDATA[Bar]]></item>

snippets/migration/wsc54/en_new_with_delete.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<language xmlns="http://www.woltlab.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.woltlab.com http://www.woltlab.com/XSD/5.4/language.xsd" languagecode="en" languagename="English" countrycode="gb">
2+
<language xmlns="http://www.woltlab.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.woltlab.com http://www.woltlab.com/XSD/5.4/language.xsd" languagecode="en">
33
<import>
44
<category name="wcf.foo">
55
<item name="wcf.foo.bar"><![CDATA[Bar]]></item>

snippets/migration/wsc54/en_old.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<language xmlns="http://www.woltlab.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.woltlab.com http://www.woltlab.com/XSD/5.4/language.xsd" languagecode="en" languagename="English" countrycode="gb">
2+
<language xmlns="http://www.woltlab.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.woltlab.com http://www.woltlab.com/XSD/5.4/language.xsd" languagecode="en">
33
<category name="wcf.foo">
44
<item name="wcf.foo.bar"><![CDATA[Bar]]></item>
55
</category>

snippets/tutorial/tutorial-series/part-2/templateListener.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<templatelistener name="personListBirthdayColumn">
1212
<eventname>columns</eventname>
1313
<environment>admin</environment>
14-
<templatecode><![CDATA[<td class="columnDate columnBirthday">{if $person->birthday}{$person->birthday|strtotime|date}{/if}</td>]]></templatecode>
14+
<templatecode><![CDATA[<td class="columnDate columnBirthday">{if $person->birthday}{$person->birthday}{/if}</td>]]></templatecode>
1515
<templatename>personList</templatename>
1616
</templatelistener>
1717
<!-- /admin -->
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{if $person->birthday}
22
<dt>{lang}wcf.person.birthday{/lang}</dt>
3-
<dd>{$person->birthday|strtotime|date}</dd>
3+
<dd>{$person->birthday}</dd>
44
{/if}

0 commit comments

Comments
 (0)