Merge branch 'staging' of github.com:joomla/joomla-cms into better_mi…

…me_error_message
joomla · Jul 12, 2017 · 510abe9 · 510abe9
2 parents 0f9e5b7 + ddbeb9e
commit 510abe9
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 7 deletions.
diff --git a/administrator/components/com_admin/models/sysinfo.php b/administrator/components/com_admin/models/sysinfo.php
@@ -193,7 +193,7 @@ protected function cleanPrivateData($dataArray, $dataType = 'other')
 	}
 
 	/**
-	 * Offuscate section values
+	 * Obfuscate section values
 	 *
 	 * @param   mixed  $sectionValues  Section data
 	 *

diff --git a/administrator/components/com_fields/models/field.php b/administrator/components/com_fields/models/field.php
@@ -545,7 +545,7 @@ public function getForm($data = array(), $loadData = true)
 	}
 
 	/**
-	 * Setting the value for the gven field id, context and item id.
+	 * Setting the value for the given field id, context and item id.
 	 *
 	 * @param   string  $fieldId  The field ID.
 	 * @param   string  $itemId   The ID of the item.

diff --git a/administrator/modules/mod_feed/tmpl/default.php b/administrator/modules/mod_feed/tmpl/default.php
@@ -53,7 +53,7 @@
 		$iUrl   = isset($feed->image) ? $feed->image : null;
 		$iTitle = isset($feed->imagetitle) ? $feed->imagetitle : null;
 		?>
-		<div style="direction: <?php echo $rssrtl ? 'rtl' :'ltr'; ?>; text-align: <?php echo $rssrtl ? 'right' :'left'; ?> ! important"  class="feed<?php echo $moduleclass_sfx; ?>">
+		<div style="direction: <?php echo $rssrtl ? 'rtl' :'ltr'; ?>; text-align: <?php echo $rssrtl ? 'right' :'left'; ?> !important"  class="feed<?php echo $moduleclass_sfx; ?>">
 		<?php
 
 		// Feed description

diff --git a/layouts/joomla/searchtools/default.php b/layouts/joomla/searchtools/default.php
@@ -28,7 +28,7 @@
 	{
 		$showSelector = $selectorField->getAttribute('filtermode', '') == 'selector' ? true : $showSelector;
 
-		// Checks if a selector shoudl be shown in the current layout.
+		// Checks if a selector should be shown in the current layout.
 		if (isset($data['view']->layout))
 		{
 			$showSelector = $selectorField->getAttribute('layout', 'default') != $data['view']->layout ? false : $showSelector;

diff --git a/media/editors/tinymce/js/plugins/dragdrop/plugin.js b/media/editors/tinymce/js/plugins/dragdrop/plugin.js
@@ -37,7 +37,7 @@ tinymce.PluginManager.add('jdragdrop', function(editor) {
 				if (resp.status == '0') {
 					removeProgessBar();
 
-					editor.windowManager.alert(resp.message + ': ' + setCustomDir + resp.location);
+					editor.windowManager.alert(resp.message + ': ' + tinyMCE.activeEditor.settings.setCustomDir + resp.location);
 
 				}
 

diff --git a/media/editors/tinymce/js/plugins/dragdrop/plugin.min.js b/media/editors/tinymce/js/plugins/dragdrop/plugin.min.js
diff --git a/modules/mod_feed/tmpl/default.php b/modules/mod_feed/tmpl/default.php
@@ -58,7 +58,7 @@
 		$iUrl   = isset($feed->image) ? $feed->image : null;
 		$iTitle = isset($feed->imagetitle) ? $feed->imagetitle : null;
 		?>
-		<div style="direction: <?php echo $rssrtl ? 'rtl' :'ltr'; ?>; text-align: <?php echo $rssrtl ? 'right' :'left'; ?> ! important"  class="feed<?php echo $moduleclass_sfx; ?>">
+		<div style="direction: <?php echo $rssrtl ? 'rtl' :'ltr'; ?>; text-align: <?php echo $rssrtl ? 'right' :'left'; ?> !important"  class="feed<?php echo $moduleclass_sfx; ?>">
 		<?php
 		// Feed description
 		if ($feed->title !== null && $params->get('rsstitle', 1))