Prepare for 2.5.8 release

fitorec · Nov 7, 2012 · b95f8ac · b95f8ac
1 parent 96af6aa
commit b95f8ac
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 4 deletions.
diff --git a/administrator/includes/framework.php b/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();
 }

diff --git a/build/build.php b/build/build.php
@@ -29,7 +29,7 @@
 
 // Set release for each build
 // Release is third digit (like '0', '1', or '2')
-$release = '7';
+$release = '8';
 
 // Set path to git binary (e.g., /usr/local/git/bin/git or /urs/bin/git)
 $gitPath = '/usr/bin/git';

diff --git a/components/com_users/views/login/tmpl/default_login.php b/components/com_users/views/login/tmpl/default_login.php
@@ -9,6 +9,7 @@
 
 defined('_JEXEC') or die;
 JHtml::_('behavior.keepalive');
+JHtml::_('behavior.noframes');
 ?>
 <div class="login<?php echo $this->pageclass_sfx?>">
 	<?php if ($this->params->get('show_page_heading')) : ?>

diff --git a/components/com_users/views/profile/tmpl/edit.php b/components/com_users/views/profile/tmpl/edit.php
@@ -12,6 +12,7 @@
 JHtml::_('behavior.keepalive');
 JHtml::_('behavior.tooltip');
 JHtml::_('behavior.formvalidation');
+JHtml::_('behavior.noframes');
 //load user_profile plugin language
 $lang = JFactory::getLanguage();
 $lang->load( 'plg_user_profile', JPATH_ADMINISTRATOR );

diff --git a/components/com_users/views/registration/tmpl/default.php b/components/com_users/views/registration/tmpl/default.php
@@ -12,6 +12,7 @@
 JHtml::_('behavior.keepalive');
 JHtml::_('behavior.tooltip');
 JHtml::_('behavior.formvalidation');
+JHtml::_('behavior.noframes');
 ?>
 <div class="registration<?php echo $this->pageclass_sfx?>">
 <?php if ($this->params->get('show_page_heading')) : ?>

diff --git a/components/com_users/views/reset/tmpl/complete.php b/components/com_users/views/reset/tmpl/complete.php
@@ -11,6 +11,7 @@
 
 JHtml::_('behavior.keepalive');
 JHtml::_('behavior.formvalidation');
+JHtml::_('behavior.noframes');
 ?>
 <div class="reset-complete<?php echo $this->pageclass_sfx?>">
 	<?php if ($this->params->get('show_page_heading')) : ?>

diff --git a/includes/framework.php b/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');

diff --git a/installation/CHANGELOG b/installation/CHANGELOG
@@ -26,6 +26,8 @@ $ -> Language fix or change
 - -> Removed
 ! -> Note
 
+-------------------- 2.5.8 Stable Release [8-November-2012] ------------------
+
 29-Oct-2012 Jean-Marie Simonet
  # [#29575] Article Manager excludes identity of author
 

diff --git a/libraries/cms/version/version.php b/libraries/cms/version/version.php
@@ -35,7 +35,7 @@ final class JVersion
 	public $CODENAME = 'Ember';
 
 	/** @var  string  Release date. */
-	public $RELDATE = '13-November-2012';
+	public $RELDATE = '8-November-2012';
 
 	/** @var  string  Release time. */
 	public $RELTIME = '14:00';