diff --git a/addons/member_extra_info/member_extra_info.lib.php b/addons/member_extra_info/member_extra_info.lib.php
index cf6af6c29..8b4e05c3d 100644
--- a/addons/member_extra_info/member_extra_info.lib.php
+++ b/addons/member_extra_info/member_extra_info.lib.php
@@ -6,13 +6,12 @@
// If member_srl < 0, then return text only in the body
$member_srl = $matches[3];
if($member_srl<0) return $matches[5];
+ // If member_srl=o(not a member), return the entire body
+ if(!$member_srl) return $matches[0];
- $site_module_info = Context::get('site_module_info');
$oMemberModel = &getModel('member');
- $group_image = $oMemberModel->getGroupImageMark($member_srl,$site_module_info->site_srl);
- // If member_srl=o(not a member), return the entire body
$nick_name = $matches[5];
- if(!$member_srl) return $matches[0];
+
// If pre-defined data in the global variablesm return it
if(!$GLOBALS['_transImageNameList'][$member_srl]->cached) {
$GLOBALS['_transImageNameList'][$member_srl]->cached = true;
@@ -22,7 +21,12 @@
else $image_name_file = '';
if(file_exists($image_mark_file)) $GLOBALS['_transImageNameList'][$member_srl]->image_mark_file = $image_mark_file;
else $image_mark_file = '';
+
+ $site_module_info = Context::get('site_module_info');
+ $group_image = $oMemberModel->getGroupImageMark($member_srl,$site_module_info->site_srl);
+ $GLOBALS['_transImageNameList'][$member_srl]->group_image = $group_image;
} else {
+ $group_image = $GLOBALS['_transImageNameList'][$member_srl]->group_image;
$image_name_file = $GLOBALS['_transImageNameList'][$member_srl]->image_name_file;
$image_mark_file = $GLOBALS['_transImageNameList'][$member_srl]->image_mark_file;
}
diff --git a/classes/context/Context.class.php b/classes/context/Context.class.php
index fbcdf4f0a..5d4853d80 100644
--- a/classes/context/Context.class.php
+++ b/classes/context/Context.class.php
@@ -721,6 +721,7 @@ class Context {
**/
function _filterRequestVar($key, $val, $do_stripslashes = 1) {
if( ($key == 'page' || $key == 'cpage' || substr($key,-3)=='srl')) return !preg_match('/^[0-9,]+$/',$val)?(int)$val:$val;
+ if($key == 'mid' || $key == 'vid' || $key == 'search_keyword') return htmlspecialchars($val);
if(is_array($val) && count($val) ) {
foreach($val as $k => $v) {
if($do_stripslashes && version_compare(PHP_VERSION, '5.9.0', '<') && get_magic_quotes_gpc()) $v = stripslashes($v);
diff --git a/classes/db/DBMysql.class.php b/classes/db/DBMysql.class.php
index d5fe2b462..dafff7aba 100644
--- a/classes/db/DBMysql.class.php
+++ b/classes/db/DBMysql.class.php
@@ -156,7 +156,7 @@
if(isset($arrayIndexEndValue)) return $output;
else return $output[0];
}
- mysql_free_result($result);
+ $this->db_free_result($result);
return $output;
}
@@ -439,6 +439,10 @@
{
return mysql_fetch_object($result);
}
+
+ function db_free_result(&$result){
+ return mysql_free_result($result);
+ }
function getParser(){
return new DBParser('`', '`', $this->prefix);
diff --git a/classes/db/DBMysqli.class.php b/classes/db/DBMysqli.class.php
index 933fd8c60..fe383b6b4 100644
--- a/classes/db/DBMysqli.class.php
+++ b/classes/db/DBMysqli.class.php
@@ -112,6 +112,10 @@
{
return mysqli_fetch_object($result);
}
+
+ function db_free_result(&$result){
+ return mysqli_free_result($result);
+ }
}
return new DBMysqli;
diff --git a/classes/module/ModuleHandler.class.php b/classes/module/ModuleHandler.class.php
index 788a3ba30..d31c7eb1d 100644
--- a/classes/module/ModuleHandler.class.php
+++ b/classes/module/ModuleHandler.class.php
@@ -404,7 +404,7 @@
if($type == "view" && $this->module_info->use_mobile == "Y" && Mobile::isMobileCheckByAgent())
{
global $lang;
- $footer = '';
+ $footer = '';
Context::addHtmlFooter($footer);
}
diff --git a/common/lang/lang.xml b/common/lang/lang.xml
index 0ee845cbf..50ebf6326 100644
--- a/common/lang/lang.xml
+++ b/common/lang/lang.xml
@@ -1089,8 +1089,8 @@
-
-
-
+
+
@@ -1103,8 +1103,8 @@
-
-
-
+
+
diff --git a/config/config.inc.php b/config/config.inc.php
index 9044fcde1..d5ffb8d49 100644
--- a/config/config.inc.php
+++ b/config/config.inc.php
@@ -13,7 +13,7 @@
* @brief display XE's full version
* Even The file should be revised when releasing altough no change is made
**/
- define('__XE_VERSION__', '1.5.0.9');
+ define('__XE_VERSION__', '1.5.1');
define('__ZBXE_VERSION__', __XE_VERSION__); // deprecated : __ZBXE_VERSION__ will be removed. Use __XE_VERSION__ instead.
/**
diff --git a/layouts/user_layout/conf/info.xml b/layouts/user_layout/conf/info.xml
index e169ac982..9e7c640c6 100644
--- a/layouts/user_layout/conf/info.xml
+++ b/layouts/user_layout/conf/info.xml
@@ -14,7 +14,7 @@
製作者名
-