Skip to content

Commit 133e9e8

Browse files
committed
Joomla 4.0.1
1 parent 0e46ab4 commit 133e9e8

File tree

7 files changed

+29
-16
lines changed

7 files changed

+29
-16
lines changed

administrator/components/com_joomlaupdate/restore_finalisation.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ public static function delete($fileName)
127127
*
128128
* @return boolean True on success
129129
*
130-
* @since __DEPLOY_VERSION__
130+
* @since 4.0.1
131131
*/
132132
public static function move($src, $dest)
133133
{

administrator/components/com_media/src/Controller/ApiController.php

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,11 @@ public function getFiles()
160160
*/
161161
public function deleteFiles()
162162
{
163+
if (!$this->app->getIdentity()->authorise('core.delete', 'com_media'))
164+
{
165+
throw new \Exception(Text::_('JLIB_APPLICATION_ERROR_DELETE_NOT_PERMITTED'), 403);
166+
}
167+
163168
$this->getModel()->delete($this->getAdapter(), $this->getPath());
164169

165170
return null;
@@ -191,6 +196,11 @@ public function deleteFiles()
191196
*/
192197
public function postFiles()
193198
{
199+
if (!$this->app->getIdentity()->authorise('core.create', 'com_media'))
200+
{
201+
throw new \Exception(Text::_('JLIB_APPLICATION_ERROR_CREATE_RECORD_NOT_PERMITTED'), 403);
202+
}
203+
194204
$adapter = $this->getAdapter();
195205
$path = $this->getPath();
196206
$content = $this->input->json;
@@ -257,6 +267,11 @@ public function postFiles()
257267
*/
258268
public function putFiles()
259269
{
270+
if (!$this->app->getIdentity()->authorise('core.edit', 'com_media'))
271+
{
272+
throw new \Exception(Text::_('JLIB_APPLICATION_ERROR_EDIT_NOT_PERMITTED'), 403);
273+
}
274+
260275
$adapter = $this->getAdapter();
261276
$path = $this->getPath();
262277

@@ -344,11 +359,6 @@ public function getModel($name = 'Api', $prefix = 'Administrator', $config = [])
344359
*/
345360
private function checkContent()
346361
{
347-
if (!$this->app->getIdentity()->authorise('core.create', 'com_media'))
348-
{
349-
throw new \Exception(Text::_('COM_MEDIA_ERROR_CREATE_NOT_PERMITTED'), 403);
350-
}
351-
352362
$params = ComponentHelper::getParams('com_media');
353363

354364
$helper = new MediaHelper;

administrator/manifests/files/joomla.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<authorUrl>www.joomla.org</authorUrl>
77
<copyright>(C) 2019 Open Source Matters, Inc.</copyright>
88
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
9-
<version>4.0.1-dev</version>
9+
<version>4.0.1</version>
1010
<creationDate>August 2021</creationDate>
1111
<description>FILES_JOOMLA_XML_DESCRIPTION</description>
1212

build/build.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -376,10 +376,13 @@ function clean_composer(string $dir)
376376
'package.json',
377377
'phpunit-pgsql.xml.dist',
378378
'phpunit.xml.dist',
379+
'plugins/sampledata/testing/testing.php',
380+
'plugins/sampledata/testing/testing.xml',
381+
'plugins/sampledata/testing/language/en-GB/en-GB.plg_sampledata_testing.ini',
382+
'plugins/sampledata/testing/language/en-GB/en-GB.plg_sampledata_testing.sys.ini',
379383
'selenium.log',
380384
'tests',
381385
// Media Manager Node Assets
382-
'administrator/components/com_media/webpack.config.js',
383386
'administrator/components/com_media/resources',
384387
);
385388

libraries/src/Filesystem/File.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ class File
2626
{
2727
/**
2828
* @var boolean true if OPCache enabled, and we have permission to invalidate files
29-
* @since __DEPLOY_VERSION__
29+
* @since 4.0.1
3030
*/
3131
protected static $canFlushFileCache;
3232

@@ -198,7 +198,7 @@ public static function copy($src, $dest, $path = null, $useStreams = false)
198198
* or FALSE if the opcode cache is disabled or other conditions returning
199199
* FALSE from opcache_invalidate (like file not found).
200200
*
201-
* @since __DEPLOY_VERSION__
201+
* @since 4.0.1
202202
*/
203203
public static function invalidateFileCache($filepath, $force = true)
204204
{
@@ -222,7 +222,7 @@ public static function invalidateFileCache($filepath, $force = true)
222222
*
223223
* @return boolean TRUE if we can proceed to use opcache_invalidate to flush a file from the OPCache
224224
*
225-
* @since __DEPLOY_VERSION__
225+
* @since 4.0.1
226226
*/
227227
public static function canFlushFileCache()
228228
{

libraries/src/Form/Field/CalendarField.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ class CalendarField extends FormField
5454
* The format will be used to filter submitted date and time.
5555
*
5656
* @var string
57-
* @since __DEPLOY_VERSION__
57+
* @since 4.0.1
5858
*/
5959
protected $filterFormat;
6060

libraries/src/Version.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,15 +61,15 @@ final class Version
6161
* @var string
6262
* @since 3.8.0
6363
*/
64-
const EXTRA_VERSION = 'dev';
64+
const EXTRA_VERSION = '';
6565

6666
/**
6767
* Development status.
6868
*
6969
* @var string
7070
* @since 3.5
7171
*/
72-
const DEV_STATUS = 'Development';
72+
const DEV_STATUS = 'Stable';
7373

7474
/**
7575
* Code name.
@@ -85,15 +85,15 @@ final class Version
8585
* @var string
8686
* @since 3.5
8787
*/
88-
const RELDATE = '17-August-2021';
88+
const RELDATE = '23-August-2021';
8989

9090
/**
9191
* Release time.
9292
*
9393
* @var string
9494
* @since 3.5
9595
*/
96-
const RELTIME = '12:56';
96+
const RELTIME = '19:47';
9797

9898
/**
9999
* Release timezone.

0 commit comments

Comments
 (0)