Merge branch 'staging' into 3.10-dev

Author: wilsonge

administrator/components/com_categories/views/categories/tmpl/default_batch_body.php

@@ -55,15 +55,17 @@
 			</div>
 		</div>
 	</div>
-	<div class="row-fluid">
-		<div class="span6">
-			<div class="control-group">
-				<label id="flip-ordering-id-lbl" for="flip-ordering-id" class="control-label">
-					<?php echo JText::_('JLIB_HTML_BATCH_FLIPORDERING_LABEL'); ?>
-				</label>
-				<?php echo JHtml::_('select.booleanlist', 'batch[flip_ordering]', array(), 0, 'JYES', 'JNO', 'flip-ordering-id'); ?>
+	<?php if ($extension === 'com_content') : ?>
+		<div class="row-fluid">
+			<div class="span6">
+				<div class="control-group">
+					<label id="flip-ordering-id-lbl" for="flip-ordering-id" class="control-label">
+						<?php echo JText::_('JLIB_HTML_BATCH_FLIPORDERING_LABEL'); ?>
+					</label>
+					<?php echo JHtml::_('select.booleanlist', 'batch[flip_ordering]', array(), 0, 'JYES', 'JNO', 'flip-ordering-id'); ?>
+				</div>
 			</div>
 		</div>
-	</div>
+	<?php endif; ?>
 </div>
 

administrator/components/com_fields/controllers/field.php

@@ -99,7 +99,7 @@ protected function allowEdit($data = array(), $key = 'id')
 			}
 
 			// Grant if current user is owner of the record
-			return $user->id == $record->created_by;
+			return $user->id == $record->created_user_id;
 		}
 
 		return false;

libraries/src/Form/Rule/ModuleLayoutRule.php

@@ -25,9 +25,9 @@ class ModuleLayoutRule extends FormRule
 	 * A valid module layout field value consists of
 	 * - optionally a template name with only characters, numbers, hypens and
 	 *   underscores, which can also be just "_" for layouts provided by the
-	 *   module, followed by a colon
+	 *   module, followed by a colon.
 	 * - the base name of the layout file, not starting with a dot and with
-	 *   only characters, numbers, dots and hypens but no underscores (see
+	 *   only characters, numbers, dots and hyphens but no underscores (see
 	 *   method "getInput" of the "ModuleLayout" field).
 	 *
 	 * @var    string

libraries/src/Plugin/PluginHelper.php

@@ -248,10 +248,7 @@ protected static function import($plugin, $autocreate = true, \JEventDispatcher
 		{
 			if (file_exists($path))
 			{
-				if (!isset($paths[$dispatcherHash][$path]))
-				{
-					require_once $path;
-				}
+				require_once $path;
 
 				$paths[$dispatcherHash][$path] = true;
 

templates/protostar/offline.php

@@ -77,7 +77,7 @@
 
 if ($this->params->get('logoFile'))
 {
-	$logo = '<img src="' . JUri::root() . $this->params->get('logoFile') . '" alt="' . $sitename . '" />';
+	$logo = '<img src="' . htmlspecialchars(JUri::root() . $this->params->get('logoFile'), ENT_QUOTES, 'UTF-8') . '" alt="' . $sitename . '" />';
 }
 elseif ($this->params->get('sitetitle'))
 {