Skip to content

Commit 1ed07e2

Browse files
author
Michael Babker
committed
Prepare 3.1.5 release
1 parent 27b25cf commit 1ed07e2

File tree

11 files changed

+19
-12
lines changed

11 files changed

+19
-12
lines changed

Diff for: administrator/components/com_media/helpers/media.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public static function canUpload($file, &$err)
6666

6767
$allowable = explode(',', $params->get('upload_extensions'));
6868
$ignored = explode(',', $params->get('ignore_extensions'));
69-
if (!in_array($format, $allowable) && !in_array($format, $ignored))
69+
if ($format == '' || $format == false || (!in_array($format, $allowable) && !in_array($format, $ignored)))
7070
{
7171
$err = 'COM_MEDIA_ERROR_WARNFILETYPE';
7272
return false;

Diff for: administrator/includes/framework.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
/*
1818
* Installation check, and check on removal of the install directory.
1919
*/
20-
if (!file_exists(JPATH_CONFIGURATION.'/configuration.php') || (filesize(JPATH_CONFIGURATION.'/configuration.php') < 10) /*|| file_exists(JPATH_INSTALLATION.'/index.php')*/)
20+
if (!file_exists(JPATH_CONFIGURATION.'/configuration.php') || (filesize(JPATH_CONFIGURATION.'/configuration.php') < 10) || file_exists(JPATH_INSTALLATION.'/index.php'))
2121
{
2222
header('Location: ../installation/index.php');
2323
exit();

Diff for: administrator/manifests/files/joomla.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
<authorEmail>admin@joomla.org</authorEmail>
66
<authorUrl>www.joomla.org</authorUrl>
77
<copyright>(C) 2005 - 2013 Open Source Matters. All rights reserved</copyright>
8-
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
8+
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
99
<version>3.1.5</version>
10-
<creationDate>July 2013</creationDate>
10+
<creationDate>August 2013</creationDate>
1111
<description>FILES_JOOMLA_XML_DESCRIPTION</description>
1212

1313
<scriptfile>administrator/components/com_admin/script.php</scriptfile>

Diff for: build/build.php

+5-3
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232

3333
// Set release for each build
3434
// Release is third digit (like '0', '1', or '2')
35-
$release = '2';
35+
$release = '5';
3636

3737
// Set path to git binary (e.g., /usr/local/git/bin/git or /urs/bin/git)
3838
$gitPath = '/usr/bin/git';
@@ -75,6 +75,7 @@
7575
// Note: If we add new top-level directories or files, be sure to include them here.
7676
$filesArray = array(
7777
"administrator/index.php\n" => true,
78+
"bin/index.html\n" => true,
7879
"cache/index.html\n" => true,
7980
"cli/index.html\n" => true,
8081
"components/index.html\n" => true,
@@ -114,8 +115,9 @@
114115
// Loop through and add all files except: tests, installation, build, .git, or docs
115116
foreach ($files AS $file)
116117
{
117-
if (substr($file, 2, 5) != 'tests' && substr($file, 2, 12) != 'installation' && substr($file,2,5) != 'build'
118-
&& substr($file, 2, 4) != '.git' && substr($file, 2, 4) != 'docs' )
118+
if (substr($file, 2, 5) != 'tests' && substr($file, 2, 12) != 'installation' && substr($file, 2, 5) != 'build'
119+
&& substr($file, 2, 4) != '.git' && substr($file, 2, 4) != 'docs' && substr($file, 2, 7) != '.travis'
120+
&& substr($file, 2, 6) != 'travis' && substr($file, 2, 7) != 'phpunit' && substr($file, -3) != '.md')
119121
{
120122
// Don't add deleted files to the list
121123
if (substr($file, 0, 1) != 'D')

Diff for: includes/framework.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
// Installation check, and check on removal of the install directory.
1919
//
2020

21-
if (!file_exists(JPATH_CONFIGURATION.'/configuration.php') || (filesize(JPATH_CONFIGURATION.'/configuration.php') < 10) /*|| file_exists(JPATH_INSTALLATION.'/index.php')*/) {
21+
if (!file_exists(JPATH_CONFIGURATION.'/configuration.php') || (filesize(JPATH_CONFIGURATION.'/configuration.php') < 10) || file_exists(JPATH_INSTALLATION.'/index.php')) {
2222

2323
if (file_exists(JPATH_INSTALLATION.'/index.php'))
2424
{

Diff for: installation/CHANGELOG

+2
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ $ -> Language fix or change
2525
- -> Removed
2626
! -> Note
2727

28+
-------------------- 3.1.5 Stable Release [01-Aug-2013] ------------------
29+
2830
31-Jul-2013 Michael Babker
2931
# [#31620] Some plugins cause blank pages in 3.1.4. Thanks Don Gilbert
3032
# [#31607] REGRESSION: Changing the autoload order in a point release. Thanks Don Gilbert

Diff for: installation/sql/mysql/joomla.sql

+1-1
Original file line numberDiff line numberDiff line change
@@ -594,7 +594,7 @@ INSERT INTO `#__extensions` (`extension_id`, `name`, `type`, `element`, `folder`
594594
(507, 'isis', 'template', 'isis', '', 1, 1, 1, 0, '{"name":"isis","type":"template","creationDate":"3\\/30\\/2012","author":"Kyle Ledbetter","copyright":"Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"","version":"1.0","description":"TPL_ISIS_XML_DESCRIPTION","group":""}', '{"templateColor":"","logoFile":""}', '', '', 0, '0000-00-00 00:00:00', 0, 0),
595595
(600, 'English (United Kingdom)', 'language', 'en-GB', '', 0, 1, 1, 1, '', '', '', '', 0, '0000-00-00 00:00:00', 0, 0),
596596
(601, 'English (United Kingdom)', 'language', 'en-GB', '', 1, 1, 1, 1, '', '', '', '', 0, '0000-00-00 00:00:00', 0, 0),
597-
(700, 'Joomla! CMS', 'file', 'joomla', '', 0, 1, 1, 1, '{"legacy":false,"name":"files_joomla","type":"file","creationDate":"July 2013","author":"Joomla!","copyright":"(C) 2005 - 2013 Open Source Matters. All rights reserved","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.1.3","description":"FILES_JOOMLA_XML_DESCRIPTION","group":""}', '', '', '', 0, '0000-00-00 00:00:00', 0, 0);
597+
(700, 'Joomla! CMS', 'file', 'joomla', '', 0, 1, 1, 1, '{"legacy":false,"name":"files_joomla","type":"file","creationDate":"August 2013","author":"Joomla!","copyright":"(C) 2005 - 2013 Open Source Matters. All rights reserved","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.1.5","description":"FILES_JOOMLA_XML_DESCRIPTION","group":""}', '', '', '', 0, '0000-00-00 00:00:00', 0, 0);
598598

599599
-- --------------------------------------------------------
600600

Diff for: installation/sql/postgresql/joomla.sql

+1-1
Original file line numberDiff line numberDiff line change
@@ -639,7 +639,7 @@ INSERT INTO "#__extensions" ("extension_id", "name", "type", "element", "folder"
639639

640640
-- Files Extensions
641641
INSERT INTO "#__extensions" ("extension_id", "name", "type", "element", "folder", "client_id", "enabled", "access", "protected", "manifest_cache", "params", "custom_data", "system_data", "checked_out", "checked_out_time", "ordering", "state") VALUES
642-
(700, 'Joomla! CMS', 'file', 'joomla', '', 0, 1, 1, 1, '{"legacy":false,"name":"files_joomla","type":"file","creationDate":"July 2013","author":"Joomla!","copyright":"(C) 2005 - 2013 Open Source Matters. All rights reserved","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.1.3","description":"FILES_JOOMLA_XML_DESCRIPTION","group":""}', '', '', '', 0, '1970-01-01 00:00:00', 0, 0);
642+
(700, 'Joomla! CMS', 'file', 'joomla', '', 0, 1, 1, 1, '{"legacy":false,"name":"files_joomla","type":"file","creationDate":"August 2013","author":"Joomla!","copyright":"(C) 2005 - 2013 Open Source Matters. All rights reserved","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.1.5","description":"FILES_JOOMLA_XML_DESCRIPTION","group":""}', '', '', '', 0, '1970-01-01 00:00:00', 0, 0);
643643

644644
SELECT nextval('#__extensions_extension_id_seq');
645645
SELECT setval('#__extensions_extension_id_seq', 10000, false);

Diff for: installation/sql/sqlazure/joomla.sql

+1-1
Original file line numberDiff line numberDiff line change
@@ -990,7 +990,7 @@ UNION ALL
990990
SELECT 601, 'English (United Kingdom)', 'language', 'en-GB', '', 1, 1, 1, 1, '', '', '', '', 0, '1900-01-01 00:00:00', 0, 0;
991991

992992
INSERT INTO #__extensions (extension_id, name, type, element, folder, client_id, enabled, access, protected, manifest_cache, params, custom_data, system_data, checked_out, checked_out_time, ordering, state)
993-
VALUES (700, 'Joomla! CMS', 'file', 'joomla', '', 0, 1, 1, 1, '{"name":"files_joomla","type":"file","creationDate":"July 2013","author":"Joomla!","copyright":"(C) 2005 - 2013 Open Source Matters. All rights reserved","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.1.3","description":"FILES_JOOMLA_XML_DESCRIPTION","group":""}', '', '', '', 0, '1900-01-01 00:00:00', 0, 0);
993+
VALUES (700, 'Joomla! CMS', 'file', 'joomla', '', 0, 1, 1, 1, '{"name":"files_joomla","type":"file","creationDate":"August 2013","author":"Joomla!","copyright":"(C) 2005 - 2013 Open Source Matters. All rights reserved","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.1.5","description":"FILES_JOOMLA_XML_DESCRIPTION","group":""}', '', '', '', 0, '1900-01-01 00:00:00', 0, 0);
994994

995995
SET IDENTITY_INSERT #__extensions OFF;
996996

Diff for: libraries/cms/version/version.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ final class JVersion
3737
public $CODENAME = 'Ember';
3838

3939
/** @var string Release date. */
40-
public $RELDATE = '26-July-2013';
40+
public $RELDATE = '01-August-2013';
4141

4242
/** @var string Release time. */
4343
public $RELTIME = '14:00';

Diff for: libraries/joomla/filesystem/file.php

+3
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,9 @@ public static function stripExt($file)
6161
*/
6262
public static function makeSafe($file)
6363
{
64+
// Remove any trailing dots, as those aren't ever valid file names.
65+
$file = rtrim($file, '.');
66+
6467
$regex = array('#(\.){2,}#', '#[^A-Za-z0-9\.\_\- ]#', '#^\.#');
6568

6669
return preg_replace($regex, '', $file);

0 commit comments

Comments
 (0)