Skip to content

Commit 7801005

Browse files
splorpsplorp
committed
Updated Kirby to 3.10.0.1
1 parent 30f1a9b commit 7801005

File tree

8 files changed

+33
-21
lines changed

8 files changed

+33
-21
lines changed

‎content/04_changes/changes.txt‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ Sources: _$s
2626
#### Summary of changes:
2727

2828
+ Updated and expanded several existing entries
29+
+ Updated [Kirby](https://getkirby.com/) to version [3.10.0.1](https://github.com/getkirby/kirby/releases/tag/3.10.0.1) for security patches
2930

3031
### 3.1.2
3132

@@ -205,8 +206,8 @@ Sources: 135
205206
+ Added 2 new terms
206207
+ Added 2 new sources
207208
+ Updated and expanded several existing entries
208-
+ Updated [Kirby](https://getkirby.com/) to version [2.5.14](https://github.com/getkirby-v2/kirby/releases/tag/2.5.14) for security patch
209-
+ Updated [Parsedown](https://github.com/erusev/parsedown) to version [1.7.2](https://github.com/erusev/parsedown/releases/tag/1.7.2) for security patch
209+
+ Updated [Kirby](https://getkirby.com/) to version [2.5.14](https://github.com/getkirby-v2/kirby/releases/tag/2.5.14) for security patches
210+
+ Updated [Parsedown](https://github.com/erusev/parsedown) to version [1.7.2](https://github.com/erusev/parsedown/releases/tag/1.7.2) for security patches
210211

211212
### 2.4.5
212213

‎kirby/composer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"description": "The Kirby 3 core",
44
"license": "proprietary",
55
"type": "kirby-cms",
6-
"version": "3.10.0",
6+
"version": "3.10.0.1",
77
"keywords": [
88
"kirby",
99
"cms",

‎kirby/composer.lock‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎kirby/config/api/routes/users.php‎

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
<?php
22

3+
use Kirby\Exception\Exception;
34
use Kirby\Filesystem\F;
5+
use Kirby\Toolkit\Str;
46

57
/**
68
* User Routes
@@ -79,10 +81,27 @@
7981
],
8082
'method' => 'POST',
8183
'action' => function (string $id) {
82-
$this->user($id)->avatar()?->delete();
83-
8484
return $this->upload(
8585
function ($source, $filename) use ($id) {
86+
$type = F::type($filename);
87+
if ($type !== 'image') {
88+
throw new Exception([
89+
'key' => 'file.type.invalid',
90+
'data' => compact('type')
91+
]);
92+
}
93+
94+
$mime = F::mime($source);
95+
if (Str::startsWith($mime, 'image/') !== true) {
96+
throw new Exception([
97+
'key' => 'file.mime.invalid',
98+
'data' => compact('mime')
99+
]);
100+
}
101+
102+
// delete the old avatar
103+
$this->user($id)->avatar()?->delete();
104+
86105
$props = [
87106
'filename' => 'profile.' . F::extension($filename),
88107
'template' => 'avatar',

‎kirby/panel/dist/js/index.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎kirby/vendor/composer/autoload_classmap.php‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -143,10 +143,6 @@
143143
'Kirby\\Cms\\UserRules' => $baseDir . '/src/Cms/UserRules.php',
144144
'Kirby\\Cms\\Users' => $baseDir . '/src/Cms/Users.php',
145145
'Kirby\\Cms\\Visitor' => $baseDir . '/src/Cms/Visitor.php',
146-
'Kirby\\ComposerInstaller\\CmsInstaller' => $vendorDir . '/getkirby/composer-installer/src/ComposerInstaller/CmsInstaller.php',
147-
'Kirby\\ComposerInstaller\\Installer' => $vendorDir . '/getkirby/composer-installer/src/ComposerInstaller/Installer.php',
148-
'Kirby\\ComposerInstaller\\Plugin' => $vendorDir . '/getkirby/composer-installer/src/ComposerInstaller/Plugin.php',
149-
'Kirby\\ComposerInstaller\\PluginInstaller' => $vendorDir . '/getkirby/composer-installer/src/ComposerInstaller/PluginInstaller.php',
150146
'Kirby\\Data\\Data' => $baseDir . '/src/Data/Data.php',
151147
'Kirby\\Data\\Handler' => $baseDir . '/src/Data/Handler.php',
152148
'Kirby\\Data\\Json' => $baseDir . '/src/Data/Json.php',

‎kirby/vendor/composer/autoload_static.php‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -256,10 +256,6 @@ class ComposerStaticInita8011b477bb239488e5d139cdeb7b31e
256256
'Kirby\\Cms\\UserRules' => __DIR__ . '/../..' . '/src/Cms/UserRules.php',
257257
'Kirby\\Cms\\Users' => __DIR__ . '/../..' . '/src/Cms/Users.php',
258258
'Kirby\\Cms\\Visitor' => __DIR__ . '/../..' . '/src/Cms/Visitor.php',
259-
'Kirby\\ComposerInstaller\\CmsInstaller' => __DIR__ . '/..' . '/getkirby/composer-installer/src/ComposerInstaller/CmsInstaller.php',
260-
'Kirby\\ComposerInstaller\\Installer' => __DIR__ . '/..' . '/getkirby/composer-installer/src/ComposerInstaller/Installer.php',
261-
'Kirby\\ComposerInstaller\\Plugin' => __DIR__ . '/..' . '/getkirby/composer-installer/src/ComposerInstaller/Plugin.php',
262-
'Kirby\\ComposerInstaller\\PluginInstaller' => __DIR__ . '/..' . '/getkirby/composer-installer/src/ComposerInstaller/PluginInstaller.php',
263259
'Kirby\\Data\\Data' => __DIR__ . '/../..' . '/src/Data/Data.php',
264260
'Kirby\\Data\\Handler' => __DIR__ . '/../..' . '/src/Data/Handler.php',
265261
'Kirby\\Data\\Json' => __DIR__ . '/../..' . '/src/Data/Json.php',

‎kirby/vendor/composer/installed.php‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?php return array(
22
'root' => array(
33
'name' => 'getkirby/cms',
4-
'pretty_version' => '3.10.0',
5-
'version' => '3.10.0.0',
6-
'reference' => NULL,
4+
'pretty_version' => '3.10.0.1',
5+
'version' => '3.10.0.1',
6+
'reference' => null,
77
'type' => 'kirby-cms',
88
'install_path' => __DIR__ . '/../../',
99
'aliases' => array(),
@@ -38,9 +38,9 @@
3838
'dev_requirement' => false,
3939
),
4040
'getkirby/cms' => array(
41-
'pretty_version' => '3.10.0',
42-
'version' => '3.10.0.0',
43-
'reference' => NULL,
41+
'pretty_version' => '3.10.0.1',
42+
'version' => '3.10.0.1',
43+
'reference' => null,
4444
'type' => 'kirby-cms',
4545
'install_path' => __DIR__ . '/../../',
4646
'aliases' => array(),

0 commit comments

Comments
 (0)