Skip to content
This repository
Browse code

Prepare for 2.5.1 release

  • Loading branch information...
commit 830c8c54be64f9d9f6fc00bf6f0f03447d483053 1 parent b6f1e2b
Mark Dexter authored February 01, 2012
4  administrator/components/com_contact/models/contacts.php
@@ -212,8 +212,8 @@ protected function getListQuery()
212 212
 		}
213 213
 
214 214
 		// Add the list ordering clause.
215  
-		$orderCol	= $this->state->get('list.ordering');
216  
-		$orderDirn	= $this->state->get('list.direction');
  215
+		$orderCol	= $this->state->get('list.ordering', 'a.name');
  216
+		$orderDirn	= $this->state->get('list.direction', 'asc');
217 217
 		if ($orderCol == 'a.ordering' || $orderCol == 'category_title') {
218 218
 			$orderCol = 'c.title '.$orderDirn.', a.ordering';
219 219
 		}
3  administrator/components/com_content/content.php
@@ -14,6 +14,9 @@
14 14
 	return JError::raiseWarning(404, JText::_('JERROR_ALERTNOAUTHOR'));
15 15
 }
16 16
 
  17
+// Register helper class
  18
+JLoader::register('ContentHelper', dirname(__FILE__) . '/helpers/content.php');
  19
+
17 20
 // Include dependencies
18 21
 jimport('joomla.application.component.controller');
19 22
 
2  administrator/components/com_content/controller.php
@@ -34,8 +34,6 @@ class ContentController extends JController
34 34
 	 */
35 35
 	public function display($cachable = false, $urlparams = false)
36 36
 	{
37  
-		require_once JPATH_COMPONENT.'/helpers/content.php';
38  
-
39 37
 		// Load the submenu.
40 38
 		ContentHelper::addSubmenu(JRequest::getCmd('view', 'articles'));
41 39
 
4  administrator/components/com_content/models/articles.php
@@ -239,8 +239,8 @@ protected function getListQuery()
239 239
 		}
240 240
 
241 241
 		// Add the list ordering clause.
242  
-		$orderCol	= $this->state->get('list.ordering');
243  
-		$orderDirn	= $this->state->get('list.direction');
  242
+		$orderCol	= $this->state->get('list.ordering', 'a.title');
  243
+		$orderDirn	= $this->state->get('list.direction', 'asc');
244 244
 		if ($orderCol == 'a.ordering' || $orderCol == 'category_title') {
245 245
 			$orderCol = 'c.title '.$orderDirn.', a.ordering';
246 246
 		}
11  administrator/components/com_media/models/list.php
@@ -95,9 +95,14 @@ function getList()
95 95
 		$folders	= array ();
96 96
 		$docs		= array ();
97 97
 
98  
-		// Get the list of files and folders from the given folder
99  
-		$fileList	= JFolder::files($basePath);
100  
-		$folderList = JFolder::folders($basePath);
  98
+		$fileList = false;
  99
+		$folderList = false;
  100
+		if (file_exists($basePath))
  101
+		{
  102
+			// Get the list of files and folders from the given folder
  103
+			$fileList	= JFolder::files($basePath);
  104
+			$folderList = JFolder::folders($basePath);
  105
+		}
101 106
 
102 107
 		// Iterate over the files if they exist
103 108
 		if ($fileList !== false) {
2  administrator/components/com_templates/controller.php
@@ -35,8 +35,6 @@ class TemplatesController extends JController
35 35
 	 */
36 36
 	public function display($cachable = false, $urlparams = false)
37 37
 	{
38  
-		require_once JPATH_COMPONENT.'/helpers/templates.php';
39  
-
40 38
 		// Load the submenu.
41 39
 		TemplatesHelper::addSubmenu(JRequest::getCmd('view', 'styles'));
42 40
 
2  administrator/components/com_templates/models/styles.php
@@ -147,7 +147,7 @@ protected function getListQuery()
147 147
 		}
148 148
 
149 149
 		// Add the list ordering clause.
150  
-		$query->order($db->escape($this->getState('list.ordering', 'a.name')).' '.$db->escape($this->getState('list.direction', 'ASC')));
  150
+		$query->order($db->escape($this->getState('list.ordering', 'a.title')).' '.$db->escape($this->getState('list.direction', 'ASC')));
151 151
 
152 152
 		//echo nl2br(str_replace('#__','jos_',$query));
153 153
 		return $query;
3  administrator/components/com_templates/templates.php
@@ -14,6 +14,9 @@
14 14
 	return JError::raiseWarning(404, JText::_('JERROR_ALERTNOAUTHOR'));
15 15
 }
16 16
 
  17
+// Register helper
  18
+JLoader::register('TemplatesHelper', dirname(__FILE__) . '/helpers/templates.php');
  19
+
17 20
 // Include dependancies
18 21
 jimport('joomla.application.component.controller');
19 22
 
2  administrator/components/com_users/controller.php
@@ -57,8 +57,6 @@ protected function canView($view)
57 57
 	 */
58 58
 	public function display($cachable = false, $urlparams = false)
59 59
 	{
60  
-		require_once JPATH_COMPONENT.'/helpers/users.php';
61  
-
62 60
 		// Load the submenu.
63 61
 		UsersHelper::addSubmenu(JRequest::getCmd('view', 'users'));
64 62
 
3  administrator/components/com_users/users.php
@@ -13,6 +13,9 @@
13 13
 	return JError::raiseWarning(404, JText::_('JERROR_ALERTNOAUTHOR'));
14 14
 }
15 15
 
  16
+// Register helper class
  17
+JLoader::register('UsersHelper', dirname(__FILE__) . '/helpers/users.php');
  18
+
16 19
 // Include dependancies
17 20
 jimport('joomla.application.component.controller');
18 21
 
2  administrator/includes/framework.php
@@ -19,7 +19,7 @@
19 19
 /*
20 20
  * Installation check, and check on removal of the install directory.
21 21
  */
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')) {
23 23
 	header('Location: ../installation/index.php');
24 24
 	exit();
25 25
 }
4  administrator/manifests/files/joomla.xml
@@ -6,8 +6,8 @@
6 6
 	<authorUrl>www.joomla.org</authorUrl>
7 7
 	<copyright>(C) 2005 - 2012 Open Source Matters. All rights reserved</copyright>
8 8
 	<license>GNU General Public License version 2 or later; see     LICENSE.txt</license>
9  
-	<version>2.5.0</version>
10  
-	<creationDate>January 2012</creationDate>
  9
+	<version>2.5.1</version>
  10
+	<creationDate>February 2012</creationDate>
11 11
 	<description>FILES_JOOMLA_XML_DESCRIPTION</description>
12 12
 
13 13
 	<scriptfile>administrator/components/com_admin/script.php</scriptfile>
2  includes/framework.php
@@ -20,7 +20,7 @@
20 20
 // Installation check, and check on removal of the install directory.
21 21
 //
22 22
 
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')) {
24 24
 
25 25
 	if (file_exists(JPATH_INSTALLATION.'/index.php')) {
26 26
 		header('Location: '.substr($_SERVER['REQUEST_URI'], 0, strpos($_SERVER['REQUEST_URI'], 'index.php')).'installation/index.php');
3  installation/CHANGELOG
@@ -26,6 +26,8 @@ $ -> Language fix or change
26 26
 - -> Removed
27 27
 ! -> Note
28 28
 
  29
+-------------------- 2.5.1 Stable Release [02-Feb-2012] ------------------
  30
+
29 31
 01-Feb-2012 Mark Dexter
30 32
  ^ [#27941] Add warning/no warning icons on Database screen
31 33
  # [#27938] labels missing for Smart Search / Finder module
@@ -79,7 +81,6 @@ $ -> Language fix or change
79 81
 
80 82
 -------------------- 2.5.0 Stable Release [24-Jan-2012] ------------------
81 83
 
82  
-
83 84
 22-Jan-2012 Christophe Demko
84 85
  # [#27810] *Strict error when creating/editing a Content Language
85 86
 
2  installation/sql/mysql/joomla.sql
@@ -536,7 +536,7 @@ INSERT INTO `#__extensions` (`extension_id`, `name`, `type`, `element`, `folder`
536 536
 (601, 'English (United Kingdom)', 'language', 'en-GB', '', 1, 1, 1, 1, '', '', '', '', 0, '0000-00-00 00:00:00', 0, 0);
537 537
 
538 538
 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":"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);
  539
+(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);
540 540
 
541 541
 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
542 542
 (800, 'joomla', 'package', 'pkg_joomla', '', 0, 1, 1, 1, '', '', '', '', 0, '0000-00-00 00:00:00', 0, 0);
2  installation/sql/sqlazure/joomla.sql
1 addition, 1 deletion not shown
2  installation/sql/sqlsrv/joomla.sql
1 addition, 1 deletion not shown
2  libraries/cms/version/version.php
@@ -35,7 +35,7 @@
35 35
 	public $CODENAME = 'Ember';
36 36
 
37 37
 	/** @var  string  Release date. */
38  
-	public $RELDATE = '1-Feb-2012';
  38
+	public $RELDATE = '2-Feb-2012';
39 39
 
40 40
 	/** @var  string  Release time. */
41 41
 	public $RELTIME = '14:00';

0 notes on commit 830c8c5

Please sign in to comment.
Something went wrong with that request. Please try again.