mirror of
https://github.com/joomla/joomla-cms.git
synced 2024-06-29 16:43:42 +00:00
Prepare for 1.7.1 release
git-svn-id: http://joomlacode.org/svn/joomla/development/trunk@22155 6f6e1ebd-4c2b-0410-823f-f34bde69bce9
This commit is contained in:
parent
bca223889a
commit
4d1bbe6194
|
@ -82,7 +82,7 @@ class MediaModelManager extends JModel
|
|||
// Create the drop-down folder select list
|
||||
$asset = JRequest::getVar('asset');
|
||||
$author = JRequest::getVar('author');
|
||||
$list = JHtml::_('select.genericlist', $options, 'folderlist', "class=\"inputbox\" size=\"1\" onchange=\"ImageManager.setFolder(this.options[this.selectedIndex].value,'".$asset."','$author'".")\" ", 'value', 'text', $base);
|
||||
$list = JHtml::_('select.genericlist', $options, 'folderlist', 'class="inputbox" size="1" onchange="ImageManager.setFolder(this.options[this.selectedIndex].value, "'.htmlspecialchars($asset).'","'.htmlspecialchars($author).'")" ', 'value', 'text', $base);
|
||||
|
||||
return $list;
|
||||
}
|
||||
|
|
|
@ -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();
|
||||
}
|
||||
|
|
|
@ -36,7 +36,7 @@ abstract class JToolBarHelper
|
|||
$icon = 'icon-48-'.preg_replace('#\.[^.]*$#', '', $icon);
|
||||
}
|
||||
|
||||
$html = '<div class="pagetitle '.implode(' ', $icons).'"><h2>'.$title.'</h2></div>';
|
||||
$html = '<div class="pagetitle '.htmlspecialchars(implode(' ', $icons)).'"><h2>'.$title.'</h2></div>';
|
||||
|
||||
$app = JFactory::getApplication();
|
||||
$app->set('JComponentTitle', $html);
|
||||
|
|
|
@ -6,8 +6,8 @@
|
|||
<authorUrl>www.joomla.org</authorUrl>
|
||||
<copyright>(C) 2005 - 2011 Open Source Matters. All rights reserved</copyright>
|
||||
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
|
||||
<version>1.7.0</version>
|
||||
<creationDate>July 2011</creationDate>
|
||||
<version>1.7.1</version>
|
||||
<creationDate>September 2011</creationDate>
|
||||
<description>FILES_JOOMLA_XML_DESCRIPTION</description>
|
||||
|
||||
<scriptfile>administrator/components/com_admin/script.php</scriptfile>
|
||||
|
|
|
@ -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');
|
||||
|
|
|
@ -23,7 +23,7 @@ final class JVersion
|
|||
public $RELEASE = '1.7';
|
||||
|
||||
/** @var string Maintenance version. */
|
||||
public $DEV_LEVEL = '0';
|
||||
public $DEV_LEVEL = '1';
|
||||
|
||||
/** @var string Development STATUS. */
|
||||
public $DEV_STATUS = 'Stable';
|
||||
|
@ -35,7 +35,7 @@ final class JVersion
|
|||
public $CODENAME = 'Ember';
|
||||
|
||||
/** @var string Release date. */
|
||||
public $RELDATE = '19-Jul-2011';
|
||||
public $RELDATE = '26-Sep-2011';
|
||||
|
||||
/** @var string Release time. */
|
||||
public $RELTIME = '14:00';
|
||||
|
|
|
@ -27,6 +27,8 @@ $ -> Language fix or change
|
|||
- -> Removed
|
||||
! -> Note
|
||||
|
||||
-------------------- 1.7.1 Stable Release [26-Sep-2011] ------------------
|
||||
|
||||
25-Sep-2011 Mark Dexter
|
||||
# [#24654] No change in 'Menu Manager: Menus', if module was assigned to other menu in shadowbox showed after click to link in 'Modules Linked to the Menu' column in 'Menu Manager: Menus'
|
||||
# [#26390] Database password with '<' fails with Connector returned number: Unable to connect to the Database
|
||||
|
|
|
@ -519,7 +519,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":"July 2011","author":"Joomla!","copyright":"(C) 2005 - 2011 Open Source Matters. All rights reserved","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"1.7.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":"September 2011","author":"Joomla!","copyright":"(C) 2005 - 2011 Open Source Matters. All rights reserved","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"1.7.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);
|
||||
|
|
|
@ -392,7 +392,7 @@ class JApplication extends JObject
|
|||
// If the headers have been sent, then we cannot send an additional location header
|
||||
// so we will output a javascript redirect statement.
|
||||
if (headers_sent()) {
|
||||
echo "<script>document.location.href='$url';</script>\n";
|
||||
echo "<script>document.location.href='".htmlspecialchars($url)."';</script>\n";
|
||||
}
|
||||
else {
|
||||
$document = JFactory::getDocument();
|
||||
|
@ -401,10 +401,10 @@ class JApplication extends JObject
|
|||
jimport('phputf8.utils.ascii');
|
||||
if ($navigator->isBrowser('msie') && !utf8_is_ascii($url)) {
|
||||
// MSIE type browser and/or server cause issues when url contains utf8 character,so use a javascript redirect method
|
||||
echo '<html><head><meta http-equiv="content-type" content="text/html; charset='.$document->getCharset().'" /><script>document.location.href=\''.$url.'\';</script></head><body></body></html>';
|
||||
echo '<html><head><meta http-equiv="content-type" content="text/html; charset='.$document->getCharset().'" /><script>document.location.href=\''.htmlspecialchars($url).'\';</script></head></html>';
|
||||
} elseif (!$moved and $navigator->isBrowser('konqueror')) {
|
||||
// WebKit browser (identified as konqueror by Joomla!) - Do not use 303, as it causes subresources reload (https://bugs.webkit.org/show_bug.cgi?id=38690)
|
||||
echo '<html><head><meta http-equiv="refresh" content="0; url='. $url .'" /><meta http-equiv="content-type" content="text/html; charset='.$document->getCharset().'" /></head><body></body></html>';
|
||||
echo '<html><head><meta http-equiv="content-type" content="text/html; charset='.$document->getCharset().'" /><meta http-equiv="refresh" content="0; url='.htmlspecialchars($url).'" /></head></html>';
|
||||
} else {
|
||||
// All other browsers, use the more efficient HTTP header method
|
||||
header($moved ? 'HTTP/1.1 301 Moved Permanently' : 'HTTP/1.1 303 See other');
|
||||
|
|
Loading…
Reference in New Issue
Block a user