Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Prepare for 2.5.1 release

  • Loading branch information...
commit 830c8c54be64f9d9f6fc00bf6f0f03447d483053 1 parent b6f1e2b
@dextercowley dextercowley authored
View
4 administrator/components/com_contact/models/contacts.php
@@ -212,8 +212,8 @@ protected function getListQuery()
}
// Add the list ordering clause.
- $orderCol = $this->state->get('list.ordering');
- $orderDirn = $this->state->get('list.direction');
+ $orderCol = $this->state->get('list.ordering', 'a.name');
+ $orderDirn = $this->state->get('list.direction', 'asc');
if ($orderCol == 'a.ordering' || $orderCol == 'category_title') {
$orderCol = 'c.title '.$orderDirn.', a.ordering';
}
View
3  administrator/components/com_content/content.php
@@ -14,6 +14,9 @@
return JError::raiseWarning(404, JText::_('JERROR_ALERTNOAUTHOR'));
}
+// Register helper class
+JLoader::register('ContentHelper', dirname(__FILE__) . '/helpers/content.php');
+
// Include dependencies
jimport('joomla.application.component.controller');
View
2  administrator/components/com_content/controller.php
@@ -34,8 +34,6 @@ class ContentController extends JController
*/
public function display($cachable = false, $urlparams = false)
{
- require_once JPATH_COMPONENT.'/helpers/content.php';
-
// Load the submenu.
ContentHelper::addSubmenu(JRequest::getCmd('view', 'articles'));
View
4 administrator/components/com_content/models/articles.php
@@ -239,8 +239,8 @@ protected function getListQuery()
}
// Add the list ordering clause.
- $orderCol = $this->state->get('list.ordering');
- $orderDirn = $this->state->get('list.direction');
+ $orderCol = $this->state->get('list.ordering', 'a.title');
+ $orderDirn = $this->state->get('list.direction', 'asc');
if ($orderCol == 'a.ordering' || $orderCol == 'category_title') {
$orderCol = 'c.title '.$orderDirn.', a.ordering';
}
View
11 administrator/components/com_media/models/list.php
@@ -95,9 +95,14 @@ function getList()
$folders = array ();
$docs = array ();
- // Get the list of files and folders from the given folder
- $fileList = JFolder::files($basePath);
- $folderList = JFolder::folders($basePath);
+ $fileList = false;
+ $folderList = false;
+ if (file_exists($basePath))
+ {
+ // Get the list of files and folders from the given folder
+ $fileList = JFolder::files($basePath);
+ $folderList = JFolder::folders($basePath);
+ }
// Iterate over the files if they exist
if ($fileList !== false) {
View
2  administrator/components/com_templates/controller.php
@@ -35,8 +35,6 @@ class TemplatesController extends JController
*/
public function display($cachable = false, $urlparams = false)
{
- require_once JPATH_COMPONENT.'/helpers/templates.php';
-
// Load the submenu.
TemplatesHelper::addSubmenu(JRequest::getCmd('view', 'styles'));
View
2  administrator/components/com_templates/models/styles.php
@@ -147,7 +147,7 @@ protected function getListQuery()
}
// Add the list ordering clause.
- $query->order($db->escape($this->getState('list.ordering', 'a.name')).' '.$db->escape($this->getState('list.direction', 'ASC')));
+ $query->order($db->escape($this->getState('list.ordering', 'a.title')).' '.$db->escape($this->getState('list.direction', 'ASC')));
//echo nl2br(str_replace('#__','jos_',$query));
return $query;
View
3  administrator/components/com_templates/templates.php
@@ -14,6 +14,9 @@
return JError::raiseWarning(404, JText::_('JERROR_ALERTNOAUTHOR'));
}
+// Register helper
+JLoader::register('TemplatesHelper', dirname(__FILE__) . '/helpers/templates.php');
+
// Include dependancies
jimport('joomla.application.component.controller');
View
2  administrator/components/com_users/controller.php
@@ -57,8 +57,6 @@ protected function canView($view)
*/
public function display($cachable = false, $urlparams = false)
{
- require_once JPATH_COMPONENT.'/helpers/users.php';
-
// Load the submenu.
UsersHelper::addSubmenu(JRequest::getCmd('view', 'users'));
View
3  administrator/components/com_users/users.php
@@ -13,6 +13,9 @@
return JError::raiseWarning(404, JText::_('JERROR_ALERTNOAUTHOR'));
}
+// Register helper class
+JLoader::register('UsersHelper', dirname(__FILE__) . '/helpers/users.php');
+
// Include dependancies
jimport('joomla.application.component.controller');
View
2  administrator/includes/framework.php
@@ -19,7 +19,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();
}
View
4 administrator/manifests/files/joomla.xml
@@ -6,8 +6,8 @@
<authorUrl>www.joomla.org</authorUrl>
<copyright>(C) 2005 - 2012 Open Source Matters. All rights reserved</copyright>
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
- <version>2.5.0</version>
- <creationDate>January 2012</creationDate>
+ <version>2.5.1</version>
+ <creationDate>February 2012</creationDate>
<description>FILES_JOOMLA_XML_DESCRIPTION</description>
<scriptfile>administrator/components/com_admin/script.php</scriptfile>
View
2  includes/framework.php
@@ -20,7 +20,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')) {
header('Location: '.substr($_SERVER['REQUEST_URI'], 0, strpos($_SERVER['REQUEST_URI'], 'index.php')).'installation/index.php');
View
3  installation/CHANGELOG
@@ -26,6 +26,8 @@ $ -> Language fix or change
- -> Removed
! -> Note
+-------------------- 2.5.1 Stable Release [02-Feb-2012] ------------------
+
01-Feb-2012 Mark Dexter
^ [#27941] Add warning/no warning icons on Database screen
# [#27938] labels missing for Smart Search / Finder module
@@ -79,7 +81,6 @@ $ -> Language fix or change
-------------------- 2.5.0 Stable Release [24-Jan-2012] ------------------
-
22-Jan-2012 Christophe Demko
# [#27810] *Strict error when creating/editing a Content Language
View
2  installation/sql/mysql/joomla.sql
@@ -536,7 +536,7 @@ INSERT INTO `#__extensions` (`extension_id`, `name`, `type`, `element`, `folder`
(601, 'English (United Kingdom)', 'language', 'en-GB', '', 1, 1, 1, 1, '', '', '', '', 0, '0000-00-00 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, '{"legacy":false,"name":"files_joomla","type":"file","creationDate":"January 2012","author":"Joomla!","copyright":"(C) 2005 - 2012 Open Source Matters. All rights reserved","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"2.5.0","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":"January 2012","author":"Joomla!","copyright":"(C) 2005 - 2012 Open Source Matters. All rights reserved","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"2.5.1","description":"FILES_JOOMLA_XML_DESCRIPTION","group":""}', '', '', '', 0, '0000-00-00 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
(800, 'joomla', 'package', 'pkg_joomla', '', 0, 1, 1, 1, '', '', '', '', 0, '0000-00-00 00:00:00', 0, 0);
View
2  installation/sql/sqlazure/joomla.sql
1 addition, 1 deletion not shown
View
2  installation/sql/sqlsrv/joomla.sql
1 addition, 1 deletion not shown
View
2  libraries/cms/version/version.php
@@ -35,7 +35,7 @@
public $CODENAME = 'Ember';
/** @var string Release date. */
- public $RELDATE = '1-Feb-2012';
+ public $RELDATE = '2-Feb-2012';
/** @var string Release time. */
public $RELTIME = '14:00';
Please sign in to comment.
Something went wrong with that request. Please try again.