joomla/cms
29
0
Fork 0
mirror of https://github.com/joomla/joomla-cms.git synced 2024-06-27 07:33:41 +00:00
Code Packages Releases Activity

Prepare for 1.7.0 release

Browse Source 
git-svn-id: http://joomlacode.org/svn/joomla/development/trunk@21879 6f6e1ebd-4c2b-0410-823f-f34bde69bce9
This commit is contained in:
Mark Dexter 2011-07-17 22:33:34 +00:00
parent e992216197
commit 36bfb6321e
5 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
administrator/includes/framework.php
View File

@ -20,7 +20,7 @@ defined('_JEXEC') or die;
/*
* 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();
}

4
includes/application.php
View File

@ -173,12 +173,12 @@ final class JSite extends JApplication
}
$document->setMetaData('rights', $this->getCfg('MetaRights'));
if ($router->getMode() == JROUTER_MODE_SEF) {
$document->setBase(JURI::current());
$document->setBase(htmlspecialchars(JURI::current()));
}
break;
case 'feed':
$document->setBase(JURI::current());
$document->setBase(htmlspecialchars(JURI::current()));
break;
}

2
includes/framework.php
View File

@ -21,7 +21,7 @@ defined('_JEXEC') or die;
// 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');

6
includes/version.php
View File

@ -26,7 +26,7 @@ final class JVersion
public $DEV_LEVEL = '0';
/** @var string Development STATUS. */
public $DEV_STATUS = 'RC1';
public $DEV_STATUS = 'Stable';
/** @var string Build number. */
public $BUILD = '';
@ -35,10 +35,10 @@ final class JVersion
public $CODENAME = 'Ember';
/** @var string Release date. */
public $RELDATE = '28-Jun-2011';
public $RELDATE = '19-Jul-2011';
/** @var string Release time. */
public $RELTIME = '23:00';
public $RELTIME = '14:00';
/** @var string Release timezone. */
public $RELTZ = 'GMT';

2
installation/CHANGELOG
View File

@ -27,6 +27,8 @@ $ -> Language fix or change
- -> Removed
! -> Note
-------------------- 1.7.0 Stable Release [19-Jul-2011] ------------------
17-Jul-2011 Mark Dexter
# Fix banner issue in sample data (Elin Waring)