Merge branch 'release/1.8.6'

xpressengine · Jul 13, 2015 · c0bd10e · c0bd10e
2 parents 5660bae + 3230a38
commit c0bd10e
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 13 deletions.
diff --git a/classes/extravar/Extravar.class.php b/classes/extravar/Extravar.class.php
@@ -289,6 +289,16 @@ function _getTypeValue($type, $value)
 		}
 	}
 
+	/**
+	 * Returns a value for HTML
+	 *
+	 * @return string Returns a value expressed in HTML.
+	 */
+	function getValue()
+	{	
+		return $this->_getTypeValue($this->type, $this->value);
+	}
+
 	/**
 	 * Returns a value for HTML
 	 *

diff --git a/common/js/plugins/jquery.fileupload/js/main.js b/common/js/plugins/jquery.fileupload/js/main.js
@@ -60,6 +60,8 @@
 				last_selected_file: null,
 			});
 
+			var currentEnforce_ssl = window.enforce_ssl;
+			if(location.protocol == 'https:') { window.enforce_ssl = true; }
 
 			var settings = {
 				url: request_uri
@@ -122,6 +124,8 @@
 					}
 				}
 			};
+			window.enforce_ssl = currentEnforce_ssl;
+
 
 			data.settings = $.extend({} , default_settings, settings, opt || {});
 			$container.data(data);
@@ -287,7 +291,6 @@
 			obj.editor_sequence = data.editorSequence;
 
 			$.exec_json('file.getFileList', obj, function(res){
-				console.log(res);
 				data.uploadTargetSrl = res.upload_target_srl;
 				editorRelKeys[data.editorSequence].primary.value = res.upload_target_srl;
 				data.uploadTargetSrl = res.uploadTargetSrl;
@@ -366,8 +369,6 @@
 
 		return u;
 	};
-
-	xe.unregisterApp();
 })(jQuery);
 
 

diff --git a/common/js/plugins/jquery.fileupload/js/main.min.js b/common/js/plugins/jquery.fileupload/js/main.min.js
diff --git a/config/config.inc.php b/config/config.inc.php
@@ -29,7 +29,7 @@
 /**
  * Display XE's full version.
  */
-define('__XE_VERSION__', '1.8.5');
+define('__XE_VERSION__', '1.8.6');
 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));

diff --git a/layouts/xedition/layout.html b/layouts/xedition/layout.html
@@ -307,35 +307,35 @@ <h1>{$sub_header_title}</h1>
 		<!--@if($_sample_slide)-->
 			<include target="./demo/slide.html" />
 		<!--@else-->
-			<div cond="$layout_info->slide_img1" style="background-image:url('{$layout_info->slide_img1}');">
+			<div cond="$layout_info->slide_img1" style="background-image:url('{$layout_info->slide_img1}');" class="swiper-slide">
 				<div cond="$layout_info->slide_text1">
 					<div>
 						{$layout_info->slide_text1}
 					</div>
 				</div>
 			</div>
-			<div cond="$layout_info->slide_img2" style="background-image:url('{$layout_info->slide_img2}');">
+			<div cond="$layout_info->slide_img2" style="background-image:url('{$layout_info->slide_img2}');" class="swiper-slide">
 				<div cond="$layout_info->slide_text2">
 					<div>
 						{$layout_info->slide_text2}
 					</div>
 				</div>
 			</div>
-			<div cond="$layout_info->slide_img3" style="background-image:url('{$layout_info->slide_img3}');">
+			<div cond="$layout_info->slide_img3" style="background-image:url('{$layout_info->slide_img3}');" class="swiper-slide">
 				<div cond="$layout_info->slide_text3">
 					<div>
 						{$layout_info->slide_text3}
 					</div>
 				</div>
 			</div>
-			<div cond="$layout_info->slide_img4" style="background-image:url('{$layout_info->slide_img4}');">
+			<div cond="$layout_info->slide_img4" style="background-image:url('{$layout_info->slide_img4}');" class="swiper-slide">
 				<div cond="$layout_info->slide_text4">
 					<div>
 						{$layout_info->slide_text4}
 					</div>
 				</div>
 			</div>
-			<div cond="$layout_info->slide_img5" style="background-image:url('{$layout_info->slide_img5}');">
+			<div cond="$layout_info->slide_img5" style="background-image:url('{$layout_info->slide_img5}');" class="swiper-slide">
 				<div cond="$layout_info->slide_text5">
 					<div>
 						{$layout_info->slide_text5}

diff --git a/modules/document/document.item.php b/modules/document/document.item.php
@@ -651,7 +651,7 @@ function getExtraVars()
 	function getExtraValue($idx)
 	{
 		$extra_vars = $this->getExtraVars();
-		return $extra_vars[$idx]->value;
+		return $extra_vars[$idx]->getValue();
 	}
 
 	function getExtraValueHTML($idx)
@@ -679,7 +679,7 @@ function getExtraEidValue($eid)
 				$extra_eid[$key->eid] = $key;
 			}
 		}
-		return $extra_eid[$eid]->value;
+		return $extra_eid[$eid]->getValue();
 	}
 
 	function getExtraEidValueHTML($eid)

diff --git a/modules/editor/skins/ckeditor/editor.html b/modules/editor/skins/ckeditor/editor.html
@@ -32,9 +32,9 @@
 <script>
 (function($){
 	"use strict";
-
 	// editor
 	$(function(){
+		<!--@if(!FileHandler::exists('common/js/plugins/ckeditor/ckeditor/config.js'))-->CKEDITOR.config.customConfig = '';<!--@endif-->
 		var settings = {
 			ckeconfig: {
 				height: '{$editor_height}',