Skip to content

Commit

Permalink
Prepare 3.3.4 release
Browse files Browse the repository at this point in the history
  • Loading branch information
Michael Babker committed Sep 22, 2014
1 parent aa895cd commit 7d10561
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 9 deletions.
2 changes: 1 addition & 1 deletion administrator/components/com_media/models/manager.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ function getFolderList($base = null)
// so both string and integer are supported.
if ($asset == 0)
{
$asset = $input->get('asset', 0, 'string');
$asset = $input->get('asset', 0, 'cmd');
}

$author = $input->get('author', 0, 'integer');
Expand Down
2 changes: 1 addition & 1 deletion administrator/includes/framework.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,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')*/)
|| (filesize(JPATH_CONFIGURATION . '/configuration.php') < 10) || file_exists(JPATH_INSTALLATION . '/index.php'))
{
if (file_exists(JPATH_INSTALLATION . '/index.php'))
{
Expand Down
4 changes: 2 additions & 2 deletions administrator/manifests/files/joomla.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
<authorUrl>www.joomla.org</authorUrl>
<copyright>(C) 2005 - 2014 Open Source Matters. All rights reserved</copyright>
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
<version>3.3.4-dev</version>
<creationDate>July 2014</creationDate>
<version>3.3.4</version>
<creationDate>September 2014</creationDate>
<description>FILES_JOOMLA_XML_DESCRIPTION</description>

<scriptfile>administrator/components/com_admin/script.php</scriptfile>
Expand Down
2 changes: 1 addition & 1 deletion includes/framework.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,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')*/)
|| (filesize(JPATH_CONFIGURATION . '/configuration.php') < 10) || file_exists(JPATH_INSTALLATION . '/index.php'))
{
if (file_exists(JPATH_INSTALLATION . '/index.php'))
{
Expand Down
8 changes: 4 additions & 4 deletions libraries/cms/version/version.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ final class JVersion
public $RELEASE = '3.3';

/** @var string Maintenance version. */
public $DEV_LEVEL = '4-dev';
public $DEV_LEVEL = '4';

/** @var string Development STATUS. */
public $DEV_STATUS = 'Development';
public $DEV_STATUS = 'Stable';

/** @var string Build number. */
public $BUILD = '';
Expand All @@ -37,10 +37,10 @@ final class JVersion
public $CODENAME = 'Ember';

/** @var string Release date. */
public $RELDATE = '25-July-2014';
public $RELDATE = '23-September-2014';

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

/** @var string Release timezone. */
public $RELTZ = 'GMT';
Expand Down
3 changes: 3 additions & 0 deletions plugins/authentication/ldap/ldap.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,9 @@ public function onUserAuthenticate($credentials, $options, &$response)
// For JLog
$response->type = 'LDAP';

// Strip null bytes from the password
$credentials['password'] = str_replace(chr(0), '', $credentials['password']);

// LDAP does not like Blank passwords (tries to Anon Bind which is bad)
if (empty($credentials['password']))
{
Expand Down

2 comments on commit 7d10561

@astempaltes
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry, but it looks like we found one additional change, it was done in plugins/system/sef/sef.php
line 81 was changed from:

$regex = '#(src|href|poster)="(?!/|' . $protocols . '|#|')([^"]*)"#m';

to:
$regex = '#\s+(src|href|poster)="(?!/|' . $protocols . '|#|')([^"]*)"#m';

There was added 'match a whitespace character', as reason our extension stopped to work :(

@Bakual
Copy link
Contributor

@Bakual Bakual commented on 7d10561 Sep 24, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please don't comment on commits, it will only get lost. Instead open a new Issue (on issues.joomla.org or on GitHub) explaining what you discovered and how to reproduce the issue.

Please sign in to comment.