Skip to content

Commit f0692e2

Browse files
authored
Merge pull request #1092 from ExpressionEngine/7.dev
Doc updates on grid and small change log update, security lock
2 parents 9cfad95 + 456f3f2 commit f0692e2

File tree

7 files changed

+40
-3
lines changed

7 files changed

+40
-3
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,4 @@ node_modules/
77
.vscode/
88
.ddev/
99
.ddev
10+
.ee_repo/

docs/control-panel/member-manager.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ This tab contains the generic settings for the role. You can also assign the rol
8484
-- Roles included in the author list are available in the author select field on the entry publish/edit page for any channel the role has permission to publish in.
8585
-- Roles included in the member lists are available to display in the [member list tag](member/memberlist.md).
8686

87-
- **Security Lock** -- If enabled, only Super Admin users can add or remove members to the role.
87+
- **Security Lock** -- If enabled, only Super Admin users can add or remove members to the role. Locked roles cannot be set as default role, so if you have open member registration, you need to have at least one role that is not locked, and set it as default in [Member Settings](control-panel/settings/members.md#default-primary-role).
8888

8989
- **Role Groups** -- Assign the role to [role groups](control-panel/member-manager.md#role-groups).
9090

docs/control-panel/settings/members.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ Set whether dates and times are localized to each members' own localization pref
7777

7878
![Default Primary Role](/_images/members_default_role.png)
7979

80-
This allows you to specify the Primary Role to which approved members will be assigned.
80+
This allows you to specify the Primary Role to which approved members will be assigned. Only roles that don't have "Security Lock" on can be selected.
8181

8282
### Member profile theme
8383

docs/fieldtypes/grid.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,8 @@ Offsets the number of rows output by the tag pair to the number specified here.
112112

113113
Allows the output of the tag pair to be ordered by a specific column, defaults to row order as set on the channel entry publish form. Entering `random` will return the rows in a random order.
114114

115+
NOTE: **Note:** Unlike `exp:channel:entries`, you can only use one column at a time for sorting.
116+
115117
### `row_id=`
116118

117119
row_id="5"

docs/fieldtypes/textarea.md

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ The Textarea is a simple free-form writing space where you can enter text or HTM
1313

1414
![textarea field](_images/field_textarea.png)
1515

16+
[TOC=2]
17+
1618
## Field Settings
1719

1820
### Textarea Row Height
@@ -34,3 +36,23 @@ Either left-to-right, or right-to-left.
3436
### Field Tools
3537

3638
Show formatting buttons to make writing markup easier, show a smiley chooser, or show a file chooser button to easily insert images or links to files.
39+
40+
## Parsing File Tags
41+
42+
The Textarea fieldtype supports the use of file tags in the format `{file:XX:field}` where `XX` is the file ID and `field` is any field associated with that file, such as `url`, `filename`, `title`, etc.
43+
44+
When the content of a Textarea field is parsed for display, these tags will be replaced with the corresponding values from the file model.
45+
46+
For example, if you have a file with ID `5`, and you want to insert its URL into the Textarea content, you would use the tag `{file:5:url}`. When the content is rendered, this tag will be replaced with the actual URL of the file.
47+
48+
The supported fields for file tags include:
49+
- `url`: The absolute URL to the file.
50+
- `file_name`: The name of the file.
51+
- `title`: The title of the file.
52+
- `description`: The description of the file.
53+
- `file_size`: The size of the file in bytes.
54+
- `width`: The width of the file in pixels.
55+
- `height`: The height of the file in pixels.
56+
- `mime_type`: The MIME type of the file.
57+
- `location`: Where the photo was taken
58+
- `credits`: Photo credits

docs/general/system-configuration-overrides.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1471,6 +1471,19 @@ Example Usage:
14711471

14721472
$config['filename_increment'] = 'y';
14731473

1474+
## `filesystem_case_sensitive`
1475+
1476+
Setting this config variable to y will enforce case-sensitive filtering on File Models. This preserves a legacy behavior, however we recommend using MySQL 8 and a case-sensitive database collation for better performance.
1477+
1478+
| Value | Behavior |
1479+
| ----- | --------------------------------------------- |
1480+
| y | Enable case-sensitive file name comparisons |
1481+
| n | Disable case-sensitive file name comparisons |
1482+
1483+
Example Usage:
1484+
1485+
$config['filesystem_case_sensitive'] = 'y';
1486+
14741487
## `force_query_string`
14751488

14761489
If enabled, ExpressionEngine will render URLs with a question mark following `index.php` in order to pass along segment information as a standard query string:

docs/installation/changelog.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@
5757
- Added caching tests [#5043](https://github.com/ExpressionEngine/ExpressionEngine/pull/5043)
5858
- Added PHP CLI script for bumping EE version [#5045](https://github.com/ExpressionEngine/ExpressionEngine/pull/5045)
5959
- Added Pro Search tests [#5078](https://github.com/ExpressionEngine/ExpressionEngine/pull/5078)
60-
- Moved table creation to the normal process [#5080](https://github.com/ExpressionEngine/ExpressionEngine/pull/5080)
6160

6261
## Version 7.5.17
6362
(Release: October 27th, 2025)

0 commit comments

Comments
 (0)