Skip to content

Commit fa56452

Browse files
author
Michael Babker
committed
Prepare 2.5.14 release
1 parent c3ef116 commit fa56452

File tree

10 files changed

+39
-34
lines changed

10 files changed

+39
-34
lines changed

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

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

6161
$allowable = explode(',', $params->get('upload_extensions'));
6262
$ignored = explode(',', $params->get('ignore_extensions'));
63-
if (!in_array($format, $allowable) && !in_array($format, $ignored))
63+
if ($format == '' || $format == false || (!in_array($format, $allowable) && !in_array($format, $ignored)))
6464
{
6565
$err = 'COM_MEDIA_ERROR_WARNFILETYPE';
6666
return false;

Diff for: administrator/includes/framework.php

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

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>2.5.14</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

+26-26
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 = '12';
35+
$release = '14';
3636

3737
// Set path to git binary (e.g., /usr/local/git/bin/git or /urs/bin/git)
3838
$gitPath = '/usr/bin/git';
@@ -74,26 +74,26 @@
7474
// So we add the index file for each top-level directory.
7575
// Note: If we add new top-level directories or files, be sure to include them here.
7676
$filesArray = array(
77-
"administrator/index.php\n" => true,
78-
"cache/index.html\n" => true,
79-
"cli/index.html\n" => true,
80-
"components/index.html\n" => true,
81-
"images/index.html\n" => true,
82-
"includes/index.html\n" => true,
83-
"language/index.html\n" => true,
84-
"libraries/index.html\n" => true,
85-
"logs/index.html\n" => true,
86-
"media/index.html\n" => true,
87-
"modules/index.html\n" => true,
88-
"plugins/index.html\n" => true,
89-
"templates/index.html\n" => true,
90-
"tmp/index.html\n" => true,
91-
"htaccess.txt\n" => true,
77+
"administrator/index.php\n" => true,
78+
"cache/index.html\n" => true,
79+
"cli/index.html\n" => true,
80+
"components/index.html\n" => true,
81+
"images/index.html\n" => true,
82+
"includes/index.html\n" => true,
83+
"language/index.html\n" => true,
84+
"libraries/index.html\n" => true,
85+
"logs/index.html\n" => true,
86+
"media/index.html\n" => true,
87+
"modules/index.html\n" => true,
88+
"plugins/index.html\n" => true,
89+
"templates/index.html\n" => true,
90+
"tmp/index.html\n" => true,
91+
"htaccess.txt\n" => true,
9292
"web.config.txt\n" => true,
9393
"robots.txt.dist\n" => true,
94-
"LICENSE.txt\n" => true,
95-
"README.txt\n" => true,
96-
"index.php\n" => true,
94+
"LICENSE.txt\n" => true,
95+
"README.txt\n" => true,
96+
"index.php\n" => true,
9797
"joomla.xml\n" => true,
9898
);
9999

@@ -113,9 +113,9 @@
113113
// Loop through and add all files except: tests, installation, build, .git, or docs
114114
foreach($files AS $file)
115115
{
116-
if (substr($file, 2, 5) != 'tests' && substr($file, 2, 12) != 'installation' && substr($file,2,5) != 'build'
117-
&& substr($file, 2, 4) != '.git' && substr($file, 2, 4) != 'docs' && substr($file, 2, 7) != '.travis'
118-
&& substr($file, 2, 6) != 'travis' && substr($file, 2, 7) != 'phpunit')
116+
if (substr($file, 2, 5) != 'tests' && substr($file, 2, 12) != 'installation' && substr($file, 2, 5) != 'build'
117+
&& substr($file, 2, 4) != '.git' && substr($file, 2, 4) != 'docs' && substr($file, 2, 7) != '.travis'
118+
&& substr($file, 2, 6) != 'travis' && substr($file, 2, 7) != 'phpunit' && substr($file, -3) != '.md')
119119
{
120120
// Don't add deleted files to the list
121121
if (substr($file, 0, 1) != 'D')
@@ -136,10 +136,10 @@
136136
file_put_contents('diffconvert/'.$version.'.'.$num, implode("", $filePut));
137137
file_put_contents('diffconvert/'.$version.'.'.$num.'-deleted', $deletedFiles);
138138

139-
// Only create archives for 0 and most recent versions. Skip other update versions.
140-
if ($num != 0 && ($num != $release - 1)) {
141-
echo "Skipping create archive for version $version.$num\n";
142-
continue;
139+
// Only create archives for 0 and most recent versions. Skip other update versions.
140+
if ($num != 0 && ($num != $release - 1)) {
141+
echo "Skipping create archive for version $version.$num\n";
142+
continue;
143143
}
144144

145145
$fromName = $num == 0 ? 'x' : $num;

Diff for: includes/framework.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
// Installation check, and check on removal of the install directory.
2121
//
2222

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

2525
if (file_exists(JPATH_INSTALLATION.'/index.php')) {
2626
header('Location: '.substr($_SERVER['REQUEST_URI'], 0, strpos($_SERVER['REQUEST_URI'], 'index.php')).'installation/index.php');

Diff for: installation/CHANGELOG

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

29+
-------------------- 2.5.14 Stable Release 01-August-2013] ------------------
30+
2931
31-Jul-2013 Jean-Marie Simonet
3032
# Missing list of Subcategories in a blog view. Revert [#30150]
3133

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -536,7 +536,7 @@ INSERT INTO `#__extensions` (`extension_id`, `name`, `type`, `element`, `folder`
536536
(601, 'English (United Kingdom)', 'language', 'en-GB', '', 1, 1, 1, 1, '', '', '', '', 0, '0000-00-00 00:00:00', 0, 0);
537537

538538
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
539-
(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":"2.5.13","description":"FILES_JOOMLA_XML_DESCRIPTION","group":""}', '', '', '', 0, '0000-00-00 00:00:00', 0, 0);
539+
(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":"2.5.14","description":"FILES_JOOMLA_XML_DESCRIPTION","group":""}', '', '', '', 0, '0000-00-00 00:00:00', 0, 0);
540540

541541
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
542542
(800, 'joomla', 'package', 'pkg_joomla', '', 0, 1, 1, 1, '', '', '', '', 0, '0000-00-00 00:00:00', 0, 0);

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -2879,7 +2879,7 @@ SELECT 601, 'English (United Kingdom)', 'language', 'en-GB', '', 1, 1, 1, 1, '',
28792879

28802880

28812881
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)
2882-
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 - 2011 Open Source Matters. All rights reserved","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"2.5.13","description":"FILES_JOOMLA_XML_DESCRIPTION","group":""}', '', '', '', 0, '1900-01-01 00:00:00', 0, 0);
2882+
VALUES (700, 'Joomla! CMS', 'file', 'joomla', '', 0, 1, 1, 1, '{"legacy":false,"name":"files_joomla","type":"file","creationDate":"August 2013","author":"Joomla!","copyright":"(C) 2005 - 2011 Open Source Matters. All rights reserved","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"2.5.14","description":"FILES_JOOMLA_XML_DESCRIPTION","group":""}', '', '', '', 0, '1900-01-01 00:00:00', 0, 0);
28832883

28842884
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
28852885
(800, 'joomla', 'package', 'pkg_joomla', '', 0, 1, 1, 1, '', '', '', '', 0, '1900-01-01 00:00:00', 0, 0);

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ final class JVersion
3535
public $CODENAME = 'Ember';
3636

3737
/** @var string Release date. */
38-
public $RELDATE = '24-July-2013';
38+
public $RELDATE = '01-August-2013';
3939

4040
/** @var string Release time. */
4141
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)