This is autolink test. This text don't have any link text.
http://mygony.com
Go to http://mygony.com
diff --git a/addons/photoswipe/rx_photoswipe.js b/addons/photoswipe/rx_photoswipe.js
index cc4891c9d..14ea40563 100644
--- a/addons/photoswipe/rx_photoswipe.js
+++ b/addons/photoswipe/rx_photoswipe.js
@@ -256,4 +256,4 @@ var initPhotoSwipeFromDOM = function(gallerySelector) {
// execute above function
-initPhotoSwipeFromDOM('.xe_content');
\ No newline at end of file
+initPhotoSwipeFromDOM('.rhymix_content, .xe_content');
\ No newline at end of file
diff --git a/addons/resize_image/css/resize_image.mobile.css b/addons/resize_image/css/resize_image.mobile.css
index 53d753413..d81bba1b6 100644
--- a/addons/resize_image/css/resize_image.mobile.css
+++ b/addons/resize_image/css/resize_image.mobile.css
@@ -1 +1 @@
-.xe_content img{max-width:100%;height:auto !important}
+.rhymix_content img, .xe_content img{max-width:100%;height:auto !important}
diff --git a/addons/resize_image/js/resize_image.js b/addons/resize_image/js/resize_image.js
index 865b4c0cb..8feeddced 100644
--- a/addons/resize_image/js/resize_image.js
+++ b/addons/resize_image/js/resize_image.js
@@ -189,7 +189,7 @@ function getScreen() {
// 이미지 슬라이드를 보는 함수
function slideshow(event) {
- var container = $(this).closest('.xe_content');
+ var container = $(this).closest('.rhymix_content, .xe_content');
var imglist = container.find("img[rel=xe_gallery]");
var currentIdx = $.inArray($(this).get(0), imglist.get());
var xScreen = getScreen();
@@ -242,7 +242,7 @@ $(window).load(function(){
});
}
- $('.xe_content').each(function() {
+ $('.rhymix_content, .xe_content').each(function() {
var contentWidth = dummy.appendTo(this).width();
dummy.remove();
if(!contentWidth) return;
diff --git a/classes/context/Context.class.php b/classes/context/Context.class.php
index 9264a4f6b..9a5a48ab7 100644
--- a/classes/context/Context.class.php
+++ b/classes/context/Context.class.php
@@ -2101,7 +2101,7 @@ class Context
}
/**
- * unload basic files that load in HTMLDisplayHandler (all|css/rhymix|css/mobile|js/jquery|js/rhymix)
+ * unload basic files that load in HTMLDisplayHandler (all|css/rhymix|css/mobile|css/xe|js/jquery|js/rhymix)
*
* @return void
*/
diff --git a/classes/display/HTMLDisplayHandler.php b/classes/display/HTMLDisplayHandler.php
index e95682995..c777dfb26 100644
--- a/classes/display/HTMLDisplayHandler.php
+++ b/classes/display/HTMLDisplayHandler.php
@@ -565,6 +565,10 @@ class HTMLDisplayHandler
{
$this->_loadBasicFile('common/css/rhymix.less', -1600000000);
}
+ if(!in_array('css/xe', Context::getUnloadedBasicFiles()))
+ {
+ $this->_loadBasicFile('common/css/xe.less', -1600000000);
+ }
if(!in_array('css/mobile', Context::getUnloadedBasicFiles()) && Mobile::isFromMobilePhone())
{
$this->_loadBasicFile('common/css/mobile.css', -1500000000);
diff --git a/classes/extravar/Extravar.class.php b/classes/extravar/Extravar.class.php
index 7c48f9293..22308dfe1 100644
--- a/classes/extravar/Extravar.class.php
+++ b/classes/extravar/Extravar.class.php
@@ -447,7 +447,7 @@ class ExtraItem
$buff[] = '
';
$buff[] = '
';
- $buff[] = '
';
+ $buff[] = '
';
$buff[] = '
-
+
diff --git a/modules/comment/tpl/declare_comment.html b/modules/comment/tpl/declare_comment.html
index 2740be0e1..ad2d4f64b 100644
--- a/modules/comment/tpl/declare_comment.html
+++ b/modules/comment/tpl/declare_comment.html
@@ -26,7 +26,7 @@
{$lang->about_improper_comment_declare}