Skip to content

Commit b234035

Browse files
authored
Merge branch '7.dev' into Pro-Variables-doc-cleanup
2 parents e94f523 + 9828563 commit b234035

File tree

13 files changed

+70
-33
lines changed

13 files changed

+70
-33
lines changed

docs/add-ons/pro-variables/type.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
@license https://expressionengine.com/license Licensed under Apache License, Version 2.0
88
-->
99

10-
# Variable types
10+
# Pro Variable Types
1111

1212

1313
Pro Variables comes with **over a dozen variable types**. Each type has its own specific settings. You can select which types are available by (de)selecting them in the [settings](/add-ons/pro-variables/settings.md).
@@ -263,6 +263,7 @@ The short name of the Image Manipulation you want to output. Alternatively, you
263263

264264
{exp:pro_variables:pair var="my_files_var"}
265265
<img src="{my_files_var:squared}" alt="">
266+
266267
{/exp:pro_variables:pair}
267268

268269
## Table
@@ -295,11 +296,13 @@ Limit the number of rows displayed.
295296
### Code examples
296297

297298
{exp:pro_variables:pair var="my_table_var"}
299+
298300
{if count == 1}<ul>{/if}
299301
<li><a href="{cell_1}">{cell_2}</a></li>
300302
{if count == total_results}</ul>{/if}
301303
{/exp:pro_variables:pair}
302304

305+
303306
{exp:pro_variables:pair var="my_table_var" sort="random" limit="1"}
304307
Random link: <a href="{cell_1}">{cell_2}</a>
305308
{/exp:pro_variables:pair}
@@ -345,6 +348,7 @@ If enabled, it will display the textarea as a monospaced, light-on-dark input fi
345348
If set to _Yes_, the field will be shown in full width.
346349

347350
### Parameters
351+
348352
When using the module tags to display a Textarea variable, you can use additional parameters to further customize the output:
349353

350354
#### `formatting`
@@ -369,3 +373,4 @@ Used with pre-parsing, this changes the default variable prefix from `preparse`
369373

370374
{!-- for a variable that has {pv:entry_id} and {pv:cat_id} in its content --}
371375
{exp:pro_variables:single var="my_var" preparse:entry_id="12" preparse:cat_id="9" preparse_prefix="pv"}
376+

docs/add-ons/rss.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ ID number of the channel (not the channel entry, the actual channel).
100100

101101
The code for the language the channel is in (en-us, etc.).
102102

103-
### `channel_name}`
103+
### `{channel_name}`
104104

105105
The name of the channel.
106106

docs/channels/entries.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ The syntax for the disable parameter is this: `disable="ITEM YOU WANT TO DISABLE
177177
- `relationship_custom_fields`
178178
- `relationship_categories`
179179

180-
NOTE: **Note:** If you disable categories, category fields will automatically be disabled.
180+
NOTE: **Note:** If you disable categories, category fields will automatically be disabled. If you disable custom_fields, that includes relationships. If you disable relationships, [relationship_custom_fields and relationship_categories](fieldtypes/relationships.md#optimizing-relationships-performance) will automatically be disabled.
181181

182182
You may specify multiple items to disable by separating them with the pipe character:
183183

@@ -191,7 +191,7 @@ For example, let's say you are using an instance of your channel tag to show you
191191
<a href="{title_permalink='channel/comments'}">{title}</a><br>
192192
{/exp:channel:entries}
193193

194-
In this example you are only showing the title of your entries and nothing else; yet, the channel tag automatically fetches categories and other data. Using the disable= parameter you can turn off the unneeded features from being queried. In this case, you don't need any of the features that can be disabled.
194+
In this example you are only showing the title of your entries and nothing else; yet, the channel tag automatically fetches categories and other data. Using the disable= parameter you can turn off the unneeded features from being queried. In this case, you don't need any of the features and they all can be disabled.
195195

196196
{exp:channel:entries orderby="date" sort="desc" limit="10" disable="categories|custom_fields|member_data|pagination"}
197197
<a href="{title_permalink='channel/comments'}">{title}</a><br>

docs/control-panel/file-manager/watermarks.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,6 @@ Text Watermarks have the following extra options:
3131

3232
Image Watermarks have the following extra options:
3333

34-
- **Path** -- If you wish to test your watermark settings, then you may specify the server path to a test image. This will allow you to see how it would actually appear on a real image. A server path is typically something similar to `/home/domain.com/http_docs/cp_images/watermark_test.jpg`. The specific setting will vary from server to server, so you may need to contact your Host or server admin to determine what your correct "server path" is.
34+
- **Path** -- The path to the image to use in the watermark, including the image name. **Note:** SVG images will not work as watermarks.
3535
- **Opacity** -- The opacity (i.e. transparency) of the watermark image. This allows the watermark to be faint and not completely obscure details from the original image behind it. A 50% opacity is typical.
36-
- **Image transparency map** -- Specify a color on the image to be "transparent" for PNG or GIF images. This works by specifying the "X" and "Y" coordinate pixel (measured from the upper left) within the image that corresponds to a pixel representative of the color you want to be transparent.
36+
- **Image transparency map** -- Specify a color on the image to be "transparent" for PNG or GIF images. This works by specifying the "X" and "Y" coordinate pixel (measured from the upper left) within the image that corresponds to a pixel representative of the color you want to be transparent.

docs/development/addon-development-overview.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@ These are just a few ideas of what you can do with custom add-ons. The possibili
3434
## Getting Started
3535
Getting started making an add-on is incredibly easy with the CLI. To begin making an add-on, simply use the [`make:addon` command](/cli/built-in-commands/make-addon.md) from the [CLI](/cli/intro.md).
3636

37+
NOTE: Add-ons generated in the latest version of ExpressionEngine are not guaranteed to be backwards compatible with other major versions of ExpressionEngine. If you need to support an older major version it is best to create the Add-on from that version of ExpressionEngine.
38+
3739
TIP: If you are working with an existing add-on, we recommend you start with [Modernizing add-ons](development/modernizing-existing-add-ons.md)
3840

3941
```

docs/fieldtypes/file.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,16 @@ If you have defined any [image manipulations](control-panel/file-manager/upload-
5858

5959
{news_image:small}
6060

61+
### Conditional Content Check
62+
63+
If you want to see if there is a file selected, the easiest method is to check for the file URL:
64+
65+
{if news_image == ""}There is no news image selected.{/if}
66+
67+
or even
68+
69+
{if news_image}File URL: {news_image}{/if}
70+
6171
### Wrap Parameter
6272

6373
You will frequently want to link to the file in your entry. Using the wrap parameter can simplify this process:

docs/fieldtypes/relationships.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -336,7 +336,7 @@ Would output in the format:
336336

337337
## Optimizing Relationships Performance
338338

339-
If you are heavily using relationship fields, it is recommended that you disable certain features, such as custom fields or categories on related entries, to speed up template loading. That can be done by applying `disable` parameter to the `exp:channel:entries` tag that includes relationship field tag (or siblings / parents tag).
339+
If you are heavily using relationship fields, it is recommended that you disable certain features such as custom fields or categories on the related entries to speed up template loading. That can be done by applying the [`disable` parameter](/channels/entries.md#disable) to the `exp:channel:entries` tag that includes the relationship field tag (or siblings / parents tag).
340340

341341
The following items can be turned off:
342342

docs/general/member-import-xml-format.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ NOTE: **Note:** If you import encrypted passwords of one type and your Expressio
9292
- `<display_signatures>`
9393
- `<email>`
9494
- `<forum_theme>`
95-
- `<group_id>`
95+
- `<role_id>`
9696
- `<in_authorlist>`
9797
- `<ip_address>`
9898
- `<join_date>`

docs/index.md

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -11,25 +11,6 @@
1111

1212
Welcome to the official ExpressionEngine Docs! In addition to the documentation, there are a number of resources linked below that will help you learn how to master ExpressionEngine.
1313

14-
<!--
15-
EECONF BANNER
16-
-->
17-
<div id="welcome-introduce" class="eeconf-promo max-w-full mx-auto p-8 lg:p-10 bg-white rounded-lg shadow-custom-black flex mt-12 flex-wrap lg:flex-nowrap">
18-
<div class="w-64 h-64 mr-10 flex-shrink-0 mb-4 lg:mb-0">
19-
<a href="https://eeconf.com/"><img src="https://eeconf.com/eeconf/300x250.jpg" width="max-w-full mb-0"></a>
20-
</div>
21-
<div class="mb-0">
22-
<span class="text-red font-bold uppercase text-xs mb-4 block tracking-wider">Events</span>
23-
<h2 class="text-purple-dark mb-4 leading-snug p-0 mt-0 border-none text-2">EEConf 2025</h2>
24-
<p class="text-purple-dark text-base pb-7 mb-0">Join us for the ExpressionEngine 2025 Conference, October 14-15 in London. Speakers. Networking. Community powered. Awesome.</p>
25-
<p class="links-wrapper flex mb-0 flex-wrap xl:flex-nowrap">
26-
<a href="https://eeconf.com/" class="inline-flex text-base h-12 leading-none justify-center items-center bg-red mb-4 xl:mb-0 mr-2.5 rounded-5 border border-solid border-red hover:bg-white hover:text-red text-white" target="_BLANK">
27-
<strong>Register</strong>&nbsp;now!
28-
<i class="fas fa-arrow-right ml-2"></i>
29-
</a>
30-
</p>
31-
</div>
32-
</div>
3314

3415
3516
<div id="welcome-introduce" class="max-w-full mx-auto p-8 lg:p-10 bg-white rounded-lg shadow-custom-black flex mt-12 flex-wrap lg:flex-nowrap">

docs/installation/changelog.md

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,49 @@
88
-->
99
# ExpressionEngine v7 Change Log
1010

11+
## Version 7.5.17
12+
(Release: October 27th, 2025)
13+
<div class="max-w-7xl mx-autotext-center">
14+
<div class="space-y-8 sm:space-y-12">
15+
<ul role="list" class="mx-auto grid grid-cols-2 gap-x-4 gap-y-1 sm:grid-cols-4 md:gap-x-6 lg:max-w-5xl lg:gap-x-8 lg:gap-y-1 xl:grid-cols-5">
16+
17+
<li><div class="space-y-4 text-center"><img class="mx-auto h-20 w-20 rounded-full lg:w-24 lg:h-24" src="https://avatars.githubusercontent.com/u/563996?v=4" /><div class="space-y-2"><div class="text-xs font-medium lg:text-sm"><p class="mb-1">Bryan Nielsen</p><p class="text-indigo-600"><a href="https://github.com/ExpressionEngine/ExpressionEngine/commits?author=bryannielsen" target="_BLANK">@bryannielsen</a></p></div></div></div></li>
18+
<li><div class="space-y-4 text-center"><img class="mx-auto h-20 w-20 rounded-full lg:w-24 lg:h-24" src="https://avatars.githubusercontent.com/u/6020323?v=4" /><div class="space-y-2"><div class="text-xs font-medium lg:text-sm"><p class="mb-1">Doug Black Jr</p><p class="text-indigo-600"><a href="https://github.com/ExpressionEngine/ExpressionEngine/commits?author=dougblackjr" target="_BLANK">@dougblackjr</a></p></div></div></div></li>
19+
<li><div class="space-y-4 text-center"><img class="mx-auto h-20 w-20 rounded-full lg:w-24 lg:h-24" src="https://avatars.githubusercontent.com/u/422821?v=4" /><div class="space-y-2"><div class="text-xs font-medium lg:text-sm"><p class="mb-1">Tom Jaeger</p><p class="text-indigo-600"><a href="https://github.com/ExpressionEngine/ExpressionEngine/commits?author=TomJaeger" target="_BLANK">@TomJaeger</a></p></div></div></div></li>
20+
<li><div class="space-y-4 text-center"><img class="mx-auto h-20 w-20 rounded-full lg:w-24 lg:h-24" src="https://avatars.githubusercontent.com/u/23382425?v=4" /><div class="space-y-2"><div class="text-xs font-medium lg:text-sm"><p class="mb-1">Yulya Lebed</p><p class="text-indigo-600"><a href="https://github.com/ExpressionEngine/ExpressionEngine/commits?author=Yulyaswan" target="_BLANK">@Yulyaswan</a></p></div></div></div></li>
21+
<li><div class="space-y-4 text-center"><img class="mx-auto h-20 w-20 rounded-full lg:w-24 lg:h-24" src="https://avatars.githubusercontent.com/u/752126?v=4" /><div class="space-y-2"><div class="text-xs font-medium lg:text-sm"><p class="mb-1">Yuri Salimovskiy</p><p class="text-indigo-600"><a href="https://github.com/ExpressionEngine/ExpressionEngine/commits?author=intoeetive" target="_BLANK">@intoeetive</a></p></div></div></div></li>
22+
<li><div class="space-y-4 text-center"><img class="mx-auto h-20 w-20 rounded-full lg:w-24 lg:h-24" src="https://avatars.githubusercontent.com/u/1181219?v=4" /><div class="space-y-2"><div class="text-xs font-medium lg:text-sm"><p class="mb-1">robinsowell</p><p class="text-indigo-600"><a href="https://github.com/ExpressionEngine/ExpressionEngine/commits?author=robinsowell" target="_BLANK">@robinsowell</a></p></div></div></div></li>
23+
</ul>
24+
</div>
25+
</div>
26+
27+
**Bug Fixes** 🐛
28+
29+
- Resolved [#5022](https://github.com/ExpressionEngine/ExpressionEngine/issues/5022) where fieldtypes used as an excerpt could throw an error when passing an array [#5027](https://github.com/ExpressionEngine/ExpressionEngine/pull/5027)
30+
- Resolved [#5012](https://github.com/ExpressionEngine/ExpressionEngine/issues/5012) where searching for files with 3 digit IDs did not work [#5015](https://github.com/ExpressionEngine/ExpressionEngine/pull/5015)
31+
- Fixed a Pro Variable bug where date setting options did not stick [#5000](https://github.com/ExpressionEngine/ExpressionEngine/pull/5000)
32+
- Fixed [#4979](https://github.com/ExpressionEngine/ExpressionEngine/issues/4979) where Live preview button did not trigger when closing preview [#4981](https://github.com/ExpressionEngine/ExpressionEngine/pull/4981)
33+
- Fixed bug where using `entry_status` in Comment form threw a PHP error [#4986](https://github.com/ExpressionEngine/ExpressionEngine/pull/4986)
34+
- Resolved [#4900](https://github.com/ExpressionEngine/ExpressionEngine/issues/4900) where `maxlength` for text field in Channel Form could have been set to 0 [#4965](https://github.com/ExpressionEngine/ExpressionEngine/pull/4965)
35+
- Resolved [#4881](https://github.com/ExpressionEngine/ExpressionEngine/issues/4881) where "No access redirect" was not performed if a restricted template is used as layout [#4883](https://github.com/ExpressionEngine/ExpressionEngine/pull/4883)
36+
- Resolved [#4346](https://github.com/ExpressionEngine/ExpressionEngine/issues/4346) where double slashes could appear in URLs [#4347](https://github.com/ExpressionEngine/ExpressionEngine/pull/4347)
37+
- Addressed [#4996](https://github.com/ExpressionEngine/ExpressionEngine/issues/4996) by removing unintended spaces in channel notifications [#4997](https://github.com/ExpressionEngine/ExpressionEngine/pull/4997)
38+
39+
**Enhancements**
40+
41+
- Improved performance of forms displaying many nested categories [#5014](https://github.com/ExpressionEngine/ExpressionEngine/pull/5014)
42+
- Improved performance of the author filter on the Entry listing page [#5009](https://github.com/ExpressionEngine/ExpressionEngine/pull/5009)
43+
- Improved performance of the category filter on the Entry listing page [#5008](https://github.com/ExpressionEngine/ExpressionEngine/pull/5008)
44+
- Improved performance of the Categories column on the Entry listing page [#5007](https://github.com/ExpressionEngine/ExpressionEngine/pull/5007)
45+
- Refactored Pro Variable "Select Entries" to use the Relationship field [#4999](https://github.com/ExpressionEngine/ExpressionEngine/pull/4999)
46+
- Improved delete member flow with explicit confirmation toggle [#5002](https://github.com/ExpressionEngine/ExpressionEngine/pull/5002), addressing [#4998](https://github.com/ExpressionEngine/ExpressionEngine/issues/4998)
47+
- Hid text to show only icons for default HTML buttons [#4980](https://github.com/ExpressionEngine/ExpressionEngine/pull/4980)
48+
- Made Notes fieldtype compatible with Grid and third-party fieldtypes [#4964](https://github.com/ExpressionEngine/ExpressionEngine/pull/4964), addressing [#4955](https://github.com/ExpressionEngine/ExpressionEngine/issues/4955)
49+
50+
**Developers** 💻
51+
52+
- Added unit tests for Template library; small fixes in Template and Api libraries [#5021](https://github.com/ExpressionEngine/ExpressionEngine/pull/5021)
53+
1154
## Version 7.5.16
1255
(Release: September 15th, 2025)
1356
<div class="max-w-7xl mx-autotext-center">

0 commit comments

Comments
 (0)