Skip to content
Permalink
Browse files Browse the repository at this point in the history
Prepare 3.1.5 release
  • Loading branch information
Michael Babker committed Aug 1, 2013
1 parent 27b25cf commit 1ed07e2
Show file tree
Hide file tree
Showing 11 changed files with 19 additions and 12 deletions.
2 changes: 1 addition & 1 deletion administrator/components/com_media/helpers/media.php
Expand Up @@ -66,7 +66,7 @@ public static function canUpload($file, &$err)

$allowable = explode(',', $params->get('upload_extensions'));
$ignored = explode(',', $params->get('ignore_extensions'));
if (!in_array($format, $allowable) && !in_array($format, $ignored))
if ($format == '' || $format == false || (!in_array($format, $allowable) && !in_array($format, $ignored)))
{
$err = 'COM_MEDIA_ERROR_WARNFILETYPE';
return false;
Expand Down
2 changes: 1 addition & 1 deletion administrator/includes/framework.php
Expand Up @@ -17,7 +17,7 @@
/*
* Installation check, and check on removal of the install directory.
*/
if (!file_exists(JPATH_CONFIGURATION.'/configuration.php') || (filesize(JPATH_CONFIGURATION.'/configuration.php') < 10) /*|| file_exists(JPATH_INSTALLATION.'/index.php')*/)
if (!file_exists(JPATH_CONFIGURATION.'/configuration.php') || (filesize(JPATH_CONFIGURATION.'/configuration.php') < 10) || file_exists(JPATH_INSTALLATION.'/index.php'))
{
header('Location: ../installation/index.php');
exit();
Expand Down
4 changes: 2 additions & 2 deletions administrator/manifests/files/joomla.xml
Expand Up @@ -5,9 +5,9 @@
<authorEmail>admin@joomla.org</authorEmail>
<authorUrl>www.joomla.org</authorUrl>
<copyright>(C) 2005 - 2013 Open Source Matters. All rights reserved</copyright>
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
<version>3.1.5</version>
<creationDate>July 2013</creationDate>
<creationDate>August 2013</creationDate>
<description>FILES_JOOMLA_XML_DESCRIPTION</description>

<scriptfile>administrator/components/com_admin/script.php</scriptfile>
Expand Down
8 changes: 5 additions & 3 deletions build/build.php
Expand Up @@ -32,7 +32,7 @@

// Set release for each build
// Release is third digit (like '0', '1', or '2')
$release = '2';
$release = '5';

// Set path to git binary (e.g., /usr/local/git/bin/git or /urs/bin/git)
$gitPath = '/usr/bin/git';
Expand Down Expand Up @@ -75,6 +75,7 @@
// Note: If we add new top-level directories or files, be sure to include them here.
$filesArray = array(
"administrator/index.php\n" => true,
"bin/index.html\n" => true,
"cache/index.html\n" => true,
"cli/index.html\n" => true,
"components/index.html\n" => true,
Expand Down Expand Up @@ -114,8 +115,9 @@
// Loop through and add all files except: tests, installation, build, .git, or docs
foreach ($files AS $file)
{
if (substr($file, 2, 5) != 'tests' && substr($file, 2, 12) != 'installation' && substr($file,2,5) != 'build'
&& substr($file, 2, 4) != '.git' && substr($file, 2, 4) != 'docs' )
if (substr($file, 2, 5) != 'tests' && substr($file, 2, 12) != 'installation' && substr($file, 2, 5) != 'build'
&& substr($file, 2, 4) != '.git' && substr($file, 2, 4) != 'docs' && substr($file, 2, 7) != '.travis'
&& substr($file, 2, 6) != 'travis' && substr($file, 2, 7) != 'phpunit' && substr($file, -3) != '.md')
{
// Don't add deleted files to the list
if (substr($file, 0, 1) != 'D')
Expand Down
2 changes: 1 addition & 1 deletion includes/framework.php
Expand Up @@ -18,7 +18,7 @@
// Installation check, and check on removal of the install directory.
//

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

if (file_exists(JPATH_INSTALLATION.'/index.php'))
{
Expand Down
2 changes: 2 additions & 0 deletions installation/CHANGELOG
Expand Up @@ -25,6 +25,8 @@ $ -> Language fix or change
- -> Removed
! -> Note

-------------------- 3.1.5 Stable Release [01-Aug-2013] ------------------

31-Jul-2013 Michael Babker
# [#31620] Some plugins cause blank pages in 3.1.4. Thanks Don Gilbert
# [#31607] REGRESSION: Changing the autoload order in a point release. Thanks Don Gilbert
Expand Down
2 changes: 1 addition & 1 deletion installation/sql/mysql/joomla.sql
Expand Up @@ -594,7 +594,7 @@ INSERT INTO `#__extensions` (`extension_id`, `name`, `type`, `element`, `folder`
(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),
(600, 'English (United Kingdom)', 'language', 'en-GB', '', 0, 1, 1, 1, '', '', '', '', 0, '0000-00-00 00:00:00', 0, 0),
(601, 'English (United Kingdom)', 'language', 'en-GB', '', 1, 1, 1, 1, '', '', '', '', 0, '0000-00-00 00:00:00', 0, 0),
(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);
(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);

-- --------------------------------------------------------

Expand Down
2 changes: 1 addition & 1 deletion installation/sql/postgresql/joomla.sql
Expand Up @@ -639,7 +639,7 @@ INSERT INTO "#__extensions" ("extension_id", "name", "type", "element", "folder"

-- Files Extensions
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
(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);
(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);

SELECT nextval('#__extensions_extension_id_seq');
SELECT setval('#__extensions_extension_id_seq', 10000, false);
Expand Down
2 changes: 1 addition & 1 deletion installation/sql/sqlazure/joomla.sql
Expand Up @@ -990,7 +990,7 @@ UNION ALL
SELECT 601, 'English (United Kingdom)', 'language', 'en-GB', '', 1, 1, 1, 1, '', '', '', '', 0, '1900-01-01 00:00:00', 0, 0;

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 (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);
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);

SET IDENTITY_INSERT #__extensions OFF;

Expand Down
2 changes: 1 addition & 1 deletion libraries/cms/version/version.php
Expand Up @@ -37,7 +37,7 @@ final class JVersion
public $CODENAME = 'Ember';

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

/** @var string Release time. */
public $RELTIME = '14:00';
Expand Down
3 changes: 3 additions & 0 deletions libraries/joomla/filesystem/file.php
Expand Up @@ -61,6 +61,9 @@ public static function stripExt($file)
*/
public static function makeSafe($file)
{
// Remove any trailing dots, as those aren't ever valid file names.
$file = rtrim($file, '.');

$regex = array('#(\.){2,}#', '#[^A-Za-z0-9\.\_\- ]#', '#^\.#');

return preg_replace($regex, '', $file);
Expand Down

0 comments on commit 1ed07e2

Please sign in to comment.