Skip to content

Commit

Permalink
Merge branch '5.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
bobdenotter committed Aug 11, 2022
2 parents f812581 + 10e0a17 commit 1085e49
Show file tree
Hide file tree
Showing 5 changed files with 33 additions and 3 deletions.
24 changes: 24 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,30 @@ Released: 2022-07-05
- Add `isTranslatable` condition in `get`-method [#3250](https://github.com/bolt/core/pull/3250)
- Additional fix for `type: number` field, set default to `min: 0`. [#3252](https://github.com/bolt/core/pull/3252)


## 5.1.12

Released: 2022-07-11

### 🐛 Bug fixes

- Tiny fix for the |image-filter [#3276](https://github.com/bolt/core/pull/3276)


## 5.1.11

Released: 2022-07-05

### 🐛 Bug fixes

- Add non-supported SVG HTML element to HTML Sanitiser [#3257](https://github.com/bolt/core/pull/3257)
- `|image`-filter looks in all possible fields [#3259](https://github.com/bolt/core/pull/3259)
- Feature/prev and next class [#3255](https://github.com/bolt/core/pull/3255)
- Additional fix for `type: number` field, set default to `min: 0`. [#3252](https://github.com/bolt/core/pull/3252)
- Fix the Canonical even Better! [#3248](https://github.com/bolt/core/pull/3248)
- Create an empty stub for postLoad to make updating smoother [#3270](https://github.com/bolt/core/pull/3270)


## 5.1.10

Released: 2022-06-17
Expand Down
2 changes: 1 addition & 1 deletion src/Configuration/Content/FieldType.php
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ protected static function defaults(): Collection
'autocomplete' => true,
'values' => [],
'min' => 0,
'max' => 1000,
'max' => 100000,
]);
}

Expand Down
7 changes: 7 additions & 0 deletions src/Event/Listener/FieldFillListener.php
Original file line number Diff line number Diff line change
Expand Up @@ -67,4 +67,11 @@ public static function trimZeroWidthWhitespace(string $string): string
{
return preg_replace('/([{}])[\x{200B}-\x{200D}\x{FEFF}]([{}])/u', '$1$2', $string);
}

/**
* @deprecated since Bolt 5.1.9
*/
public function postLoad(LifecycleEventArgs $args): void
{
}
}
2 changes: 1 addition & 1 deletion src/Twig/ContentExtension.php
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ public function getImage(?Content $content, bool $onlyValues = false)
return null;
}

private function findOneImage(Field $field): ?ImageField
private function findOneImage(Field $field)
{
if ($field instanceof ImageField && $field->get('filename')) {
return $field;
Expand Down
1 change: 0 additions & 1 deletion src/Utils/Sanitiser.php
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@ private function getPurifier(): HTMLPurifier
// Create non supported elements
$this->createNonSupportedElements($definition, explode(',',$allowedTags));


$this->purifier = new \HTMLPurifier($purifierConfig);

return $this->purifier;
Expand Down

0 comments on commit 1085e49

Please sign in to comment.