Skip to content

Commit 6958be5

Browse files
authored
Merge pull request #971 from ExpressionEngine/7.dev
ExpressionEngine 7.5.9
2 parents 9d3ee67 + ae34758 commit 6958be5

File tree

7 files changed

+62
-16
lines changed

7 files changed

+62
-16
lines changed

README.md

+6-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,12 @@ To build the theme assets, run `npm run buildAssets`. You can also dynamically r
3232

3333
### Viewing local changes
3434

35-
Manually load `/build/index.html` in your browser to view your local build. For example, `file:///Users/<username>/Documents/ExpressionEngine-User-Guide/build/index.html`. You can use the side navigation to navigate to different local files, but the search functionality always takes you to the live version at docs.expressionengine.com.
35+
There are 2 options for viewing your local changes.
36+
37+
1. Run `npx http-server -o` which should make the site available at [http://127.0.0.1:8080/build/](http://127.0.0.1:8080/build/).
38+
2. Manually view any HTML file in `/build/` in your browser. For example, `file:///Users/<username>/Documents/ExpressionEngine-User-Guide/build/index.html` to view the home page.
39+
40+
You can use the side navigation to navigate to different local files, but the search functionality takes you to the live version at [https://docs.expressionengine.com](https://docs.expressionengine.com) unless you follow the steps at [Using DocSearch Locally](#using-docsearch-locally).
3641

3742
## Using DocSearch Locally
3843

docs/advanced-usage/env-support.md

+11-10
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
-->
99
# ENV File Support
1010

11-
Config files can also be configured using [PHP Environment variables ($_ENV)](https://www.php.net/manual/en/reserved.variables.environment.php). To utilize this, create a file named `.env.php` in the root of your ExpressionEngine install.
11+
Config files can also be configured using [PHP Environment variables ($_ENV)](https://www.php.net/manual/en/reserved.variables.environment.php). To utilize this, create a file named `.env.php` in the root of your ExpressionEngine install.
1212

1313
NOTE: The `.env.php` file must be placed in same directory as the `system` directory. If you move the `system` directory above the webroot you must also move `.env.php`.
1414

@@ -31,19 +31,20 @@ This variable can now be used in your `/system/user/config.php` as illustrated b
3131
Here is an example of what it might look like to manage all your database connection settings, and Base URL in `.env.php`
3232

3333
```
34-
// .env.php
35-
36-
// URLs
34+
#.env.php
35+
#URLs
3736
BASE_URL=http://mysite.test/
3837
39-
// DATABASE SETTINGS
38+
#DATABASE SETTINGS
4039
DB_HOSTNAME=db
4140
DB_DATABASE=db
4241
DB_USERNAME=db
4342
DB_PASSWORD=db
4443
DB_PORT=3306
4544
```
4645

46+
NOTE: You must use `#` for comments within `.env.php`. Using `//` will result in your `.env.php` being unable to be read.
47+
4748
```
4849
// system/user/config.php
4950
<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
@@ -53,7 +54,7 @@ $config['save_tmpl_files'] = 'y';
5354
$config['base_url'] = $_ENV['BASE_URL'];
5455
$config['site_url'] = $config['base_url'];
5556
56-
$config['app_version'] = '7.2.0';
57+
$config['app_version'] = '7.5.8';
5758
$config['encryption_key'] = 'bb748b72de235352315122d00';
5859
$config['session_crypt_key'] = '985796e4444444563463e2c80242';
5960
@@ -83,15 +84,15 @@ The site short name can be accessed in the code using `$GLOBALS['assign_to_confi
8384
The below example demonstrates this approach, assuming you have 2 MSM sites with short names of `default_site` and `second_site`
8485

8586
```
86-
// .env.php
87-
// SITE-SPECIFIC SETTINGS
87+
#.env.php
88+
#SITE-SPECIFIC SETTINGS
8889
default_site.BASE_PATH=/home/sites/mysite.test/
8990
default_site.BASE_URL=http://mysite.test/
9091
9192
second_site.BASE_PATH=/home/sites/anothersite.test/
9293
second_site.BASE_URL=http://anothersite.test/
9394
94-
// DATABASE SETTINGS
95+
#DATABASE SETTINGS
9596
DB_HOSTNAME=db
9697
DB_DATABASE=db
9798
DB_USERNAME=db
@@ -110,7 +111,7 @@ $config['base_url'] = $_ENV[$GLOBALS['assign_to_config']['site_name'] . '.' . 'B
110111
111112
$config['site_url'] = $config['base_url'];
112113
113-
$config['app_version'] = '7.2.0';
114+
$config['app_version'] = '7.5.8';
114115
$config['encryption_key'] = 'bb748b72de235352315122d00';
115116
$config['session_crypt_key'] = '985796e4444444563463e2c80242';
116117

docs/channels/entries.md

+8
Original file line numberDiff line numberDiff line change
@@ -789,6 +789,10 @@ If five entries are being displayed per page, then for the fourth entry on the s
789789

790790
**BONUS:** Since the Search module utilizes channel variables, {absolute_count} is also available to the Search Results tag.
791791

792+
### `{absolute_index}`
793+
794+
Similar to `absolute_count` but starts at 0 instead of 1. So the first entry will have value of "0" and the second entry will have a value of "1" etc.
795+
792796
### `{absolute_results}`
793797

794798
This variable will always display the absolute total number of results that are returned by the tag, regardless of pagination.
@@ -963,6 +967,10 @@ The date the entry was submitted in GMT. This variable is **not** localized for
963967

964968
The date on which the entry was last edited in GMT. This variable is **not** localized for each user's date settings. See [Date Variable Formatting](templates/date-variable-formatting.md) for more information.
965969

970+
### `{index}`
971+
972+
Similar to `count` but starts at 0 instead of 1. So the first entry will have value of "0" and the second entry will have a value of "1" etc.
973+
966974
### `{ip_address}`
967975

968976
The IP address of the author when they posted the entry.

docs/fieldtypes/file.md

+8-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@ A File field allows you to browse through existing files and upload new files.
2525

2626
![file field with file selected](_images/field_file_file.png)
2727

28-
Once a file has been selected in the field, that file can be replaced by clicking the <img style="margin-bottom: 0px; vertical-align: middle; display:inline-block;" src="../../_images/icon_edit.png" alt="edit icon"> icon. The field selection can be cleared by clicking <img style="margin-bottom: 0px; vertical-align: middle; display:inline-block;" src="../../_images/icon_remove.png" alt="remove icon"> icon (this will not remove the file from the system). You can also change the file metadata (such as the title or description) by clicking the <img style="margin-bottom: 0px; vertical-align: middle; display:inline-block;" src="../../_images/icon_edit_meta.png" alt="settings icon"> icon - please note that file's metadata will be changed globally throughout the system.
28+
Once a file has been selected in the field, that file can be replaced by clicking the <img style="margin-bottom: 0px; vertical-align: middle; display:inline-block;"
29+
src="../_images/icon_edit.png" alt="edit icon"> icon. The field selection can be cleared by clicking <img style="margin-bottom: 0px; vertical-align: middle; display:inline-block;" src="../_images/icon_remove.png" alt="remove icon"> icon (this will not remove the file from the system). You can also change the file metadata (such as the title or description) by clicking the <img style="margin-bottom: 0px; vertical-align: middle; display:inline-block;" src="../_images/icon_edit_meta.png" alt="settings icon"> icon - please note that file's metadata will be changed globally throughout the system.
2930

3031
## Field Settings
3132

@@ -170,6 +171,12 @@ The automatically-detected MIME type of the file.
170171

171172
The date the file was last modified. See [Date Variable Formatting](templates/date-variable-formatting.md) for more information.
172173

174+
One powerful use of the modified_date is 'cache busting', forcing browers to use a new image rather than a cached one when an image is modified but not renamed:
175+
176+
{image}
177+
<img src="{url}?v={modified_date}" />
178+
{/image}
179+
173180
### `{path}`
174181

175182
The URL to the folder containing the file, including a trailing slash.

docs/installation/changelog.md

+24
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,30 @@
88
-->
99
# ExpressionEngine v7 Change Log
1010

11+
## Version 7.5.9
12+
(Release: March 26th, 2025)
13+
14+
<div class="max-w-7xl mx-autotext-center">
15+
<div class="space-y-8 sm:space-y-12">
16+
<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">
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/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>
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/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>
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/11818941?v=4" /><div class="space-y-2"><div class="text-xs font-medium lg:text-sm"><p class="mb-1">Matt Johnson</p><p class="text-indigo-600"><a href="https://github.com/ExpressionEngine/ExpressionEngine/commits?author=matthewjohns0n" target="_BLANK">@matthewjohns0n</a></p></div></div></div></li>
20+
</ul>
21+
</div>
22+
</div>
23+
24+
**Bug Fixes** 💃🐛
25+
26+
- Resolved [#4692](https://github.com/ExpressionEngine/ExpressionEngine/issues/4692) where Search add-on did not include enough custom fields when searching multiple channels
27+
- Resolved [#4745](https://github.com/ExpressionEngine/ExpressionEngine/issues/4745) where using `edit_date` variable in Structure navigation was giving PHP error
28+
- Resolved [#4725](https://github.com/ExpressionEngine/ExpressionEngine/issues/4725) where Search was showing an error if `results` parameter was too big
29+
- Resolved [#4720](https://github.com/ExpressionEngine/ExpressionEngine/issues/4720) where file usage was not calculated correctly for textareas containing multiple images
30+
- Resolved [#4689](https://github.com/ExpressionEngine/ExpressionEngine/issues/4689) where adding category from entry page could show wrong UI
31+
- Resolved [#4682](https://github.com/ExpressionEngine/ExpressionEngine/issues/4682) where cloning entry with hidden RTE field was giving PHP error
32+
- Resolved an issue where curl requests on Windows could not use the native root certificate store
33+
- Resolved an issue where updates from the CLI would not increment the version number
34+
1135
## Version 7.5.8
1236
(Release: March 4th, 2025)
1337

theme/_assets/default.min.css

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

theme/assets-src/styles/sidebar.less

+4-3
Original file line numberDiff line numberDiff line change
@@ -126,22 +126,23 @@
126126
}
127127
// All nested lists
128128
.sidebar-toc li ul {
129-
margin: 8px 0 0 1em;
129+
margin: 18px 0 0 1em;
130130
padding-left: 1em;
131131
border-left: 1px solid rgb(226, 229, 238);
132132
}
133133

134134
// All items
135135
.sidebar-toc li {
136-
margin-bottom: 5px;
136+
margin-bottom: 13px;
137137
color: @dark-grey;
138138
padding-right: @p-sm;
139139
}
140140

141141
// First level items
142142
.sidebar-toc > ul > li {
143-
margin: 0 0 10px 0;
143+
margin: 0 0 18px 0;
144144
font-size: 0.95em;
145+
line-height: 1.14em;
145146
}
146147
.sidebar-toc > ul > li > a {
147148
color: rgb(117, 118, 152);

0 commit comments

Comments
 (0)