Skip to content

Commit edfb1a0

Browse files
committed
Merge branch 'develop' into 1.8
2 parents 9893a60 + 2620e83 commit edfb1a0

File tree

2 files changed

+18
-18
lines changed

2 files changed

+18
-18
lines changed

README.md

+16-16
Original file line numberDiff line numberDiff line change
@@ -39,22 +39,22 @@ You can download a **ready-built** package from the [Downloads page on https://g
3939

4040
You can create a new project with the latest **stable** Grav release with the following command:
4141

42-
```
43-
$ composer create-project getgrav/grav ~/webroot/grav
42+
```bash
43+
composer create-project getgrav/grav ~/webroot/grav
4444
```
4545

4646
### From GitHub
4747

4848
1. Clone the Grav repository from [https://github.com/getgrav/grav]() to a folder in the webroot of your server, e.g. `~/webroot/grav`. Launch a **terminal** or **console** and navigate to the webroot folder:
49-
```
50-
$ cd ~/webroot
51-
$ git clone https://github.com/getgrav/grav.git
49+
```bash
50+
cd ~/webroot
51+
git clone https://github.com/getgrav/grav.git
5252
```
5353

5454
2. Install the **plugin** and **theme dependencies** by using the [Grav CLI application](https://learn.getgrav.org/advanced/grav-cli) `bin/grav`:
55-
```
56-
$ cd ~/webroot/grav
57-
$ bin/grav install
55+
```bash
56+
cd ~/webroot/grav
57+
bin/grav install
5858
```
5959

6060
Check out the [install procedures](https://learn.getgrav.org/basics/installation) for more information.
@@ -63,28 +63,28 @@ Check out the [install procedures](https://learn.getgrav.org/basics/installation
6363

6464
You can download [plugins](https://getgrav.org/downloads/plugins) or [themes](https://getgrav.org/downloads/themes) manually from the appropriate tab on the [Downloads page on https://getgrav.org](https://getgrav.org/downloads), but the preferred solution is to use the [Grav Package Manager](https://learn.getgrav.org/advanced/grav-gpm) or `GPM`:
6565

66-
```
67-
$ bin/gpm index
66+
```bash
67+
bin/gpm index
6868
```
6969

7070
This will display all the available plugins and then you can install one or more with:
7171

72-
```
73-
$ bin/gpm install <plugin/theme>
72+
```bash
73+
bin/gpm install <plugin/theme>
7474
```
7575

7676
# Updating
7777

7878
To update Grav you should use the [Grav Package Manager](https://learn.getgrav.org/advanced/grav-gpm) or `GPM`:
7979

80-
```
81-
$ bin/gpm selfupgrade
80+
```bash
81+
bin/gpm selfupgrade
8282
```
8383

8484
To update plugins and themes:
8585

86-
```
87-
$ bin/gpm update
86+
```bash
87+
bin/gpm update
8888
```
8989

9090
## Upgrading from older version

system/src/Grav/Common/Twig/Extension/FilesystemExtension.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -272,13 +272,13 @@ public function getimagesize($filename)
272272
* @param bool $read_thumbnail
273273
* @return array|false
274274
*/
275-
public function exif_read_data($filename, ?string $required_sections, bool $as_arrays = false, bool $read_thumbnail = false)
275+
public function exif_read_data($filename, ?string $required_sections = null, bool $as_arrays = false, bool $read_thumbnail = false)
276276
{
277277
if (!Utils::functionExists('exif_read_data') || !$this->checkFilename($filename)) {
278278
return false;
279279
}
280280

281-
return exif_read_data($filename, $required_sections, $as_arrays, $read_thumbnail);
281+
return @exif_read_data($filename, $required_sections, $as_arrays, $read_thumbnail);
282282
}
283283

284284
/**

0 commit comments

Comments
 (0)