Merge branch 'release/1.8.7'

Author: bnu

Gruntfile.js

@@ -299,7 +299,17 @@ module.exports = function(grunt) {
 						grunt.file.delete('build/xe');
 						grunt.file.delete('build/temp.full.tar');
 
-						grunt.log.ok('Done!');
+						grunt.util.spawn({
+							cmd: "git",
+							args: ['diff', '--name-status', target]
+						}, function (error, result, code) {
+							var fs = require('fs');
+							result = 'Added (A), Copied (C), Deleted (D), Modified (M), Renamed (R).' + grunt.util.linefeed + result;
+							grunt.file.write(build_dir + '/CHANGED.' + version + '.txt', result);
+
+							grunt.log.ok('Done!');
+						});
+
 					});
 				});
 			}

common/js/plugins/jquery.fileupload/js/app.js

@@ -37,7 +37,7 @@
                         // send Blob objects via XHR requests:
                         disableImageResize: /Android(?!.*Chrome)|Opera/
                             .test(window.navigator.userAgent),
-                        maxFileSize: 5000000,
+                        maxFileSize: 999000,
                         acceptFileTypes: /(\.|\/)(gif|jpe?g|png)$/i
                     });
                 }

common/js/plugins/jquery.fileupload/js/jquery.fileupload-image.js

@@ -242,7 +242,7 @@
                                     blob.name = file.name;
                                 } else if (file.name) {
                                     blob.name = file.name.replace(
-                                        /\..+$/,
+                                        /\.\w+$/,
                                         '.' + blob.type.substr(6)
                                     );
                                 }

common/js/plugins/jquery.fileupload/js/jquery.fileupload.js

@@ -1,5 +1,5 @@
 /*
- * jQuery File Upload Plugin 5.42.2
+ * jQuery File Upload Plugin 5.42.3
  * https://github.com/blueimp/jQuery-File-Upload
  *
  * Copyright 2010, Sebastian Tschan
@@ -277,7 +277,8 @@
             // The following are jQuery ajax settings required for the file uploads:
             processData: false,
             contentType: false,
-            cache: false
+            cache: false,
+            timeout: 0
         },
 
         // A list of options that require reinitializing event listeners and/or
@@ -983,7 +984,10 @@
                 fileSet,
                 i,
                 j = 0;
-            if (limitSize && (!filesLength || files[0].size === undefined)) {
+            if (!filesLength) {
+                return false;
+            }
+            if (limitSize && files[0].size === undefined) {
                 limitSize = undefined;
             }
             if (!(options.singleFileUploads || limit || limitSize) ||
@@ -1344,18 +1348,19 @@
         _initDataAttributes: function () {
             var that = this,
                 options = this.options,
-                clone = $(this.element[0].cloneNode(false)),
-                data = clone.data();
-            // Avoid memory leaks:
-            clone.remove();
+                data = this.element.data();
             // Initialize options set via HTML5 data-attributes:
             $.each(
-                data,
-                function (key, value) {
-                    var dataAttributeName = 'data-' +
-                        // Convert camelCase to hyphen-ated key:
-                        key.replace(/([a-z])([A-Z])/g, '$1-$2').toLowerCase();
-                    if (clone.attr(dataAttributeName)) {
+                this.element[0].attributes,
+                function (index, attr) {
+                    var key = attr.name.toLowerCase(),
+                        value;
+                    if (/^data-/.test(key)) {
+                        // Convert hyphen-ated key to camelCase:
+                        key = key.slice(5).replace(/-[a-z]/g, function (str) {
+                            return str.charAt(1).toUpperCase();
+                        });
+                        value = data[key];
                         if (that._isRegExpOption(key, value)) {
                             value = that._getRegExp(value);
                         }

config/config.inc.php

@@ -29,7 +29,7 @@
 /**
  * Display XE's full version.
  */
-define('__XE_VERSION__', '1.8.6');
+define('__XE_VERSION__', '1.8.7');
 define('__XE_VERSION_ALPHA__', (stripos(__XE_VERSION__, 'alpha') !== false));
 define('__XE_VERSION_BETA__', (stripos(__XE_VERSION__, 'beta') !== false));
 define('__XE_VERSION_RC__', (stripos(__XE_VERSION__, 'rc') !== false));

modules/document/document.item.php

@@ -651,7 +651,14 @@ function getExtraVars()
 	function getExtraValue($idx)
 	{
 		$extra_vars = $this->getExtraVars();
-		return $extra_vars[$idx]->getValue();
+		if(is_array($extra_vars) && array_key_exists($idx,$extra_vars))
+		{
+			return $extra_vars[$idx]->getValue();
+		}
+		else
+		{
+			return '';
+		}
 	}
 
 	function getExtraValueHTML($idx)
@@ -679,7 +686,15 @@ function getExtraEidValue($eid)
 				$extra_eid[$key->eid] = $key;
 			}
 		}
-		return $extra_eid[$eid]->getValue();
+		
+		if(is_array($extra_eid) && array_key_exists($eid,$extra_eid))
+		{
+			return $extra_eid[$eid]->getValue();
+		}
+		else
+		{
+			return '';
+		}
 	}
 
 	function getExtraEidValueHTML($eid)
@@ -690,7 +705,15 @@ function getExtraEidValueHTML($eid)
 		{
 			$extra_eid[$key->eid] = $key;
 		}
-		return $extra_eid[$eid]->getValueHTML();
+		
+		if(is_array($extra_eid) && array_key_exists($eid,$extra_eid))
+		{
+			return $extra_eid[$eid]->getValueHTML();
+		}
+		else
+		{
+			return '';
+		}
 	}
 
 	function getExtraVarsValue($key)