Permalink
Browse files

Prepare 3.8.4 release

  • Loading branch information...
mbabker committed Jan 29, 2018
1 parent 5ec9838 commit 0ec372fdc6ad5ad63082636a0942b3ea39acc7b7
@@ -106,6 +106,7 @@
label="COM_ADMIN_USER_FIELD_BACKEND_TEMPLATE_LABEL"
description="COM_ADMIN_USER_FIELD_BACKEND_TEMPLATE_DESC"
client="administrator"
filter="uint"
>
<option value="">JOPTION_USE_DEFAULT</option>
</field>
@@ -42,7 +42,7 @@ public function onCustomFieldsPrepareDom($field, DOMElement $parent, JForm $form
foreach ($this->getOptionsFromField($field) as $value => $name)
{
$option = new DOMElement('option', htmlspecialchars($value, ENT_COMPAT, 'UTF-8'));
$option->nodeValue = htmlspecialchars(JText::_($name), ENT_COMPAT, 'UTF-8');
$option->textContent = htmlspecialchars(JText::_($name), ENT_COMPAT, 'UTF-8');
$element = $fieldNode->appendChild($option);
$element->setAttribute('value', $value);
@@ -165,6 +165,7 @@
label="COM_USERS_USER_FIELD_BACKEND_TEMPLATE_LABEL"
description="COM_USERS_USER_FIELD_BACKEND_TEMPLATE_DESC"
client="administrator"
filter="uint"
>
<option value="">JOPTION_USE_DEFAULT</option>
</field>
@@ -6,7 +6,7 @@
<authorUrl>www.joomla.org</authorUrl>
<copyright>(C) 2005 - 2018 Open Source Matters. All rights reserved</copyright>
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
<version>3.8.4-rc2</version>
<version>3.8.4</version>
<creationDate>January 2018</creationDate>
<description>FILES_JOOMLA_XML_DESCRIPTION</description>
@@ -37,14 +37,14 @@ function hathormessage_postinstall_condition()
}
// Get the current user admin style
$adminstyle = $user->getParam('admin_style', '');
$adminstyle = $user->getParam('admin_style');
if ($adminstyle != '')
if ($adminstyle)
{
$query = $db->getQuery(true)
->select('template')
->from($db->quoteName('#__template_styles'))
->where($db->quoteName('id') . ' = ' . $adminstyle[0])
->where($db->quoteName('id') . ' = ' . (int) $adminstyle)
->where($db->quoteName('client_id') . ' = 1');
// Get the template name associated to the admin style
@@ -82,15 +82,15 @@ function hathormessage_postinstall_action()
$isisStyleId = $db->setQuery($query)->loadColumn();
$isisStyleName = $db->setQuery($query)->loadColumn(1);
$adminstyle = $user->getParam('admin_style', '');
$adminstyle = $user->getParam('admin_style');
// The user uses the system setting so no need to change that.
if ($adminstyle != '')
if ($adminstyle)
{
$query = $db->getQuery(true)
->select('template')
->from($db->quoteName('#__template_styles'))
->where($db->quoteName('id') . ' = ' . $adminstyle[0])
->where($db->quoteName('id') . ' = ' . (int) $adminstyle)
->where($db->quoteName('client_id') . ' = 1');
$template = $db->setQuery($query)->loadResult();
@@ -9,6 +9,7 @@
label="COM_USERS_USER_FIELD_BACKEND_TEMPLATE_LABEL"
description="COM_USERS_USER_FIELD_BACKEND_TEMPLATE_DESC"
client="administrator"
filter="uint"
>
<option value="">JOPTION_USE_DEFAULT</option>
</field>
@@ -172,6 +172,9 @@ public static function base($pathonly = false)
$script_name = $_SERVER['SCRIPT_NAME'];
}
// Extra cleanup to remove invalid chars in the URL to prevent injections through broken server implementation
$script_name = str_replace(array("'", '"', '<', '>'), array('%27', '%22', '%3C', '%3E'), $script_name);
static::$base['path'] = rtrim(dirname($script_name), '/\\');
}
}
View
@@ -60,7 +60,7 @@
* @var string
* @since 3.8.0
*/
const EXTRA_VERSION = 'rc2';
const EXTRA_VERSION = '';
/**
* Release version.
@@ -78,15 +78,15 @@
* @since 3.5
* @deprecated 4.0 Use separated version constants instead
*/
const DEV_LEVEL = '4-rc2';
const DEV_LEVEL = '4';
/**
* Development status.
*
* @var string
* @since 3.5
*/
const DEV_STATUS = 'Release Candidate';
const DEV_STATUS = 'Stable';
/**
* Build number.
@@ -111,15 +111,15 @@
* @var string
* @since 3.5
*/
const RELDATE = '26-January-2018';
const RELDATE = '30-January-2018';
/**
* Release time.
*
* @var string
* @since 3.5
*/
const RELTIME = '13:15';
const RELTIME = '15:00';
/**
* Release timezone.
@@ -36,10 +36,10 @@ function modChrome_no($module, &$params, &$attribs)
function modChrome_well($module, &$params, &$attribs)
{
$moduleTag = $params->get('module_tag', 'div');
$moduleTag = htmlspecialchars($params->get('module_tag', 'div'), ENT_QUOTES, 'UTF-8');
$bootstrapSize = (int) $params->get('bootstrap_size', 0);
$moduleClass = $bootstrapSize !== 0 ? ' span' . $bootstrapSize : '';
$headerTag = htmlspecialchars($params->get('header_tag', 'h3'), ENT_COMPAT, 'UTF-8');
$headerTag = htmlspecialchars($params->get('header_tag', 'h3'), ENT_QUOTES, 'UTF-8');
$headerClass = htmlspecialchars($params->get('header_class', 'page-header'), ENT_COMPAT, 'UTF-8');
if ($module->content)
@@ -22,8 +22,8 @@ function modChrome_none($module, &$params, &$attribs)
*/
function modChrome_html5($module, &$params, &$attribs)
{
$moduleTag = $params->get('module_tag', 'div');
$headerTag = htmlspecialchars($params->get('header_tag', 'h3'), ENT_COMPAT, 'UTF-8');
$moduleTag = htmlspecialchars($params->get('module_tag', 'div'), ENT_QUOTES, 'UTF-8');
$headerTag = htmlspecialchars($params->get('header_tag', 'h3'), ENT_QUOTES, 'UTF-8');
$bootstrapSize = (int) $params->get('bootstrap_size', 0);
$moduleClass = $bootstrapSize !== 0 ? ' span' . $bootstrapSize : '';
@@ -88,8 +88,8 @@ function modChrome_horz($module, &$params, &$attribs)
*/
function modChrome_xhtml($module, &$params, &$attribs)
{
$moduleTag = $params->get('module_tag', 'div');
$headerTag = htmlspecialchars($params->get('header_tag', 'h3'), ENT_COMPAT, 'UTF-8');
$moduleTag = htmlspecialchars($params->get('module_tag', 'div'), ENT_QUOTES, 'UTF-8');
$headerTag = htmlspecialchars($params->get('header_tag', 'h3'), ENT_QUOTES, 'UTF-8');
$bootstrapSize = (int) $params->get('bootstrap_size', 0);
$moduleClass = $bootstrapSize !== 0 ? ' span' . $bootstrapSize : '';

0 comments on commit 0ec372f

Please sign in to comment.