diff --git a/addons/autolink/autolink.spec.html b/addons/autolink/autolink.spec.html index 103795949..8c1292322 100644 --- a/addons/autolink/autolink.spec.html +++ b/addons/autolink/autolink.spec.html @@ -1,16 +1,16 @@ - - + + - + Autolink Addon Unit Test - - - - - - - - + + + + + +'); + Context::addHtmlHeader(''); Context::loadFile(array('./addons/captcha/captcha.min.js', 'body', '', null), true); } } diff --git a/classes/context/Context.class.php b/classes/context/Context.class.php index 9b090458e..595105073 100644 --- a/classes/context/Context.class.php +++ b/classes/context/Context.class.php @@ -845,6 +845,13 @@ class Context { elseif($this->getRequestMethod()=='POST'&&isset($_POST[$key])) $set_to_vars = true; else $set_to_vars = false; + if($set_to_vars) + { + $val = preg_replace('/<\?.*(\?>)?/iUsm', '', $val); + $val = preg_replace('/<\%.*(\%>)?/iUsm', '', $val); + $val = preg_replace('/.*<[\s]*\/[\s]*script[\s]*>/iUsm', '', $val); + } + $this->set($key, $val, $set_to_vars); } } diff --git a/classes/db/DB.class.php b/classes/db/DB.class.php index d339947a1..5960af780 100644 --- a/classes/db/DB.class.php +++ b/classes/db/DB.class.php @@ -407,6 +407,7 @@ */ function executeQuery($query_id, $args = NULL, $arg_columns = NULL) { static $cache_file = array(); + if(!$query_id) return new Object(-1, 'msg_invalid_queryid'); if(!$this->db_type) return; @@ -414,7 +415,7 @@ $this->query_id = $query_id; - if(!isset($cache_file[$query_id])) { + if(!isset($cache_file[$query_id]) || !file_exists($cache_file[$query_id])) { $id_args = explode('.', $query_id); if(count($id_args) == 2) { $target = 'modules'; diff --git a/classes/display/VirtualXMLDisplayHandler.php b/classes/display/VirtualXMLDisplayHandler.php index a3ec60c31..40ae0ae5a 100644 --- a/classes/display/VirtualXMLDisplayHandler.php +++ b/classes/display/VirtualXMLDisplayHandler.php @@ -24,7 +24,7 @@ class VirtualXMLDisplayHandler { if($message != 'fail') $output->message = $message; } - $html = ' - - -{Context::getBodyHeader()} -{$content} -{Context::getHtmlFooter()} + xe.current_lang = "{$lang_type}"; + //]]> + + + {Context::getBodyHeader()} + + {$content} + + {Context::getHtmlFooter()} -
+
{@ $js_body_files = Context::getJsFile('body') } - + + diff --git a/common/tpl/mobile_layout.html b/common/tpl/mobile_layout.html index 7cabe0900..506f65d1a 100644 --- a/common/tpl/mobile_layout.html +++ b/common/tpl/mobile_layout.html @@ -1,15 +1,19 @@ + - + + + + - - + + {Context::getBrowserTitle()} {@ $css_files = Context::getCssFile() } - + @@ -19,7 +23,7 @@ - + @@ -35,9 +39,11 @@ - + {@ $ssl_actions = Context::getSSLActions() } - + diff --git a/common/tpl/popup_layout.html b/common/tpl/popup_layout.html index 8536d842f..1a9cecd8c 100644 --- a/common/tpl/popup_layout.html +++ b/common/tpl/popup_layout.html @@ -2,7 +2,7 @@
{$content}
- diff --git a/common/tpl/redirect.html b/common/tpl/redirect.html index 72a28491c..087cb18a8 100644 --- a/common/tpl/redirect.html +++ b/common/tpl/redirect.html @@ -1,10 +1,10 @@ - - + + - + - \ No newline at end of file diff --git a/config/config.inc.php b/config/config.inc.php index 7f3cc2592..a159bf18b 100644 --- a/config/config.inc.php +++ b/config/config.inc.php @@ -14,7 +14,7 @@ * Display XE's full version * Even The file should be revised when releasing altough no change is made */ - define('__XE_VERSION__', '1.5.3.2'); + define('__XE_VERSION__', '1.5.3.3'); /** * @deprecated __ZBXE_VERSION__ will be removed. Use __XE_VERSION__ instead. diff --git a/config/func.inc.php b/config/func.inc.php index 67ff1c780..4afeaa1ee 100644 --- a/config/func.inc.php +++ b/config/func.inc.php @@ -1139,10 +1139,10 @@ function htmlHeader() { echo << - + + - + HTMLHEADER; @@ -1167,7 +1167,7 @@ HTMLHEADER; function alertScript($msg) { if(!$msg) return; - echo ''; + echo ''; } /** @@ -1177,7 +1177,7 @@ HTMLHEADER; */ function closePopupScript() { - echo ''; + echo ''; } /** @@ -1190,5 +1190,5 @@ HTMLHEADER; { $reloadScript = $isOpener ? 'window.opener.location.reload()' : 'document.location.reload()'; - echo ''; + echo ''; } diff --git a/layouts/xe_official/layout.html b/layouts/xe_official/layout.html index 82e0a0073..763bea7db 100644 --- a/layouts/xe_official/layout.html +++ b/layouts/xe_official/layout.html @@ -2,7 +2,7 @@ - {@$layout_info->colorset = "default"} diff --git a/libs/tar.class.php b/libs/tar.class.php index 66294278d..7536e17f4 100644 --- a/libs/tar.class.php +++ b/libs/tar.class.php @@ -99,6 +99,10 @@ class tar { // PRIVATE ACCESS FUNCTION function __parseNullPaddedString($string) { $position = strpos($string,chr(0)); + if(!$position) + { + $position = strlen($string); + } return substr($string,0,$position); } @@ -109,6 +113,7 @@ class tar { // Read Files from archive $tar_length = strlen($this->tar_file); $main_offset = 0; + $flag_longlink = false; while($main_offset < $tar_length) { // If we read a block of 512 nulls, we are at the end of the archive if(substr($this->tar_file,$main_offset,512) == str_repeat(chr(0),512)) @@ -141,6 +146,8 @@ class tar { // Parse Group name $file_gname = $this->__parseNullPaddedString(substr($this->tar_file,$main_offset + 297,32)); + $file_type = substr($this->tar_file,$main_offset + 156,1); + // Make sure our file is valid if($this->__computeUnsignedChecksum(substr($this->tar_file,$main_offset,512)) != $file_chksum) return false; @@ -159,42 +166,67 @@ class tar { $activeFile["endheader"] = substr($this->tar_file,$main_offset + 500,12); */ - if($file_size > 0) { - // Increment number of files - $this->numFiles++; + if(strtolower($file_type) == 'l' || $file_name == '././@LongLink') + { + $flag_longlink = true; + $longlink_name = $this->__parseNullPaddedString($file_contents); + } + elseif($file_type == '0') { + // Increment number of files + $this->numFiles++; - // Create us a new file in our array - $activeFile = &$this->files[]; + // Create us a new file in our array + $activeFile = &$this->files[]; - // Asign Values - $activeFile["name"] = $file_name; - $activeFile["mode"] = $file_mode; - $activeFile["size"] = $file_size; - $activeFile["time"] = $file_time; - $activeFile["user_id"] = $file_uid; - $activeFile["group_id"] = $file_gid; - $activeFile["user_name"] = $file_uname; - $activeFile["group_name"] = $file_gname; - $activeFile["checksum"] = $file_chksum; - $activeFile["file"] = $file_contents; + // Asign Values + if($flag_longlink) + { + $activeFile["name"] = $longlink_name; + } + else + { + $activeFile["name"] = $file_name; + } + $activeFile["type"] = $file_type; + $activeFile["mode"] = $file_mode; + $activeFile["size"] = $file_size; + $activeFile["time"] = $file_time; + $activeFile["user_id"] = $file_uid; + $activeFile["group_id"] = $file_gid; + $activeFile["user_name"] = $file_uname; + $activeFile["group_name"] = $file_gname; + $activeFile["checksum"] = $file_chksum; + $activeFile["file"] = $file_contents; - } else { - // Increment number of directories - $this->numDirectories++; + $flag_longlink = false; - // Create a new directory in our array - $activeDir = &$this->directories[]; + } elseif($file_type == '5') { + // Increment number of directories + $this->numDirectories++; - // Assign values - $activeDir["name"] = $file_name; - $activeDir["mode"] = $file_mode; - $activeDir["time"] = $file_time; - $activeDir["user_id"] = $file_uid; - $activeDir["group_id"] = $file_gid; - $activeDir["user_name"] = $file_uname; - $activeDir["group_name"] = $file_gname; - $activeDir["checksum"] = $file_chksum; - } + // Create a new directory in our array + $activeDir = &$this->directories[]; + + // Assign values + if($flag_longlink) + { + $activeDir["name"] = $longlink_name; + } + else + { + $activeDir["name"] = $file_name; + } + $activeDir["type"] = $file_type; + $activeDir["mode"] = $file_mode; + $activeDir["time"] = $file_time; + $activeDir["user_id"] = $file_uid; + $activeDir["group_id"] = $file_gid; + $activeDir["user_name"] = $file_uname; + $activeDir["group_name"] = $file_gname; + $activeDir["checksum"] = $file_chksum; + + $flag_longlink = false; + } // Move our offset the number of blocks we have processed $main_offset += 512 + (ceil($file_size / 512) * 512); diff --git a/modules/addon/tpl/setup_addon.html b/modules/addon/tpl/setup_addon.html index 60a97c605..e7d9412a2 100644 --- a/modules/addon/tpl/setup_addon.html +++ b/modules/addon/tpl/setup_addon.html @@ -71,7 +71,7 @@ - diff --git a/modules/communication/tpl/index.html b/modules/communication/tpl/index.html index ae0174774..d5a403f96 100644 --- a/modules/communication/tpl/index.html +++ b/modules/communication/tpl/index.html @@ -20,7 +20,7 @@ - @@ -53,6 +53,6 @@ - diff --git a/modules/counter/tpl/index.html b/modules/counter/tpl/index.html index 3e8b6f3ac..25ae29d7e 100644 --- a/modules/counter/tpl/index.html +++ b/modules/counter/tpl/index.html @@ -4,7 +4,7 @@ - @@ -28,7 +28,7 @@ {$lang->cmd_remake_cache} - diff --git a/modules/document/tpl/declared_list.html b/modules/document/tpl/declared_list.html index c1dcf4756..5a6347564 100644 --- a/modules/document/tpl/declared_list.html +++ b/modules/document/tpl/declared_list.html @@ -1,4 +1,4 @@ - diff --git a/modules/document/tpl/document_list.html b/modules/document/tpl/document_list.html index 8b69ebe03..d632cabc3 100644 --- a/modules/document/tpl/document_list.html +++ b/modules/document/tpl/document_list.html @@ -1,4 +1,4 @@ - diff --git a/modules/document/tpl/print_page.html b/modules/document/tpl/print_page.html index 9cffeb1af..5adb8b0f2 100644 --- a/modules/document/tpl/print_page.html +++ b/modules/document/tpl/print_page.html @@ -8,7 +8,7 @@ {$oDocument->getContent(false, false)} - @@ -53,7 +53,7 @@ {$lang->gallery_bg_color}
-
diff --git a/modules/editor/components/image_gallery/tpl/slide_gallery.html b/modules/editor/components/image_gallery/tpl/slide_gallery.html index 7ec58a9d1..961abf6b1 100644 --- a/modules/editor/components/image_gallery/tpl/slide_gallery.html +++ b/modules/editor/components/image_gallery/tpl/slide_gallery.html @@ -8,7 +8,7 @@ - @@ -25,7 +25,7 @@ - @@ -455,7 +455,7 @@ - diff --git a/modules/editor/tpl/js/editor.js b/modules/editor/tpl/js/editor.js index 805ef409d..72d8ef4dc 100755 --- a/modules/editor/tpl/js/editor.js +++ b/modules/editor/tpl/js/editor.js @@ -128,10 +128,10 @@ function editorStart(editor_sequence, primary_key, content_key, editor_height, f // content 생성 editor_path = editor_path.replace(/^\.\//ig, ''); var contentHtml = ''+ - ''+ - ''+ - ''+ ''+ content+ diff --git a/modules/editor/tpl/preview.html b/modules/editor/tpl/preview.html index 151b89f55..15e26a14f 100644 --- a/modules/editor/tpl/preview.html +++ b/modules/editor/tpl/preview.html @@ -1,4 +1,4 @@ - {$content} diff --git a/modules/file/tpl/file_list.html b/modules/file/tpl/file_list.html index c21fe235a..8b583bb72 100644 --- a/modules/file/tpl/file_list.html +++ b/modules/file/tpl/file_list.html @@ -1,4 +1,4 @@ - diff --git a/modules/file/tpl/iframe.html b/modules/file/tpl/iframe.html index a254c8a48..dadf59bd9 100644 --- a/modules/file/tpl/iframe.html +++ b/modules/file/tpl/iframe.html @@ -1,4 +1,4 @@ - - + diff --git a/modules/integration_search/integration_search.model.php b/modules/integration_search/integration_search.model.php index 8479ead36..c25e37d26 100644 --- a/modules/integration_search/integration_search.model.php +++ b/modules/integration_search/integration_search.model.php @@ -173,7 +173,7 @@ // Videos } elseif(preg_match('/\.(swf|flv|wmv|avi|mpg|mpeg|asx|asf|mp3)$/i', $val->source_filename)) { $obj->type = 'multimedia'; - $obj->src = sprintf('', $obj->download_url); + $obj->src = sprintf('', $obj->download_url); // Others } else { $obj->type = 'binary'; diff --git a/modules/integration_search/skins/default/no_keywords.html b/modules/integration_search/skins/default/no_keywords.html index e781bba60..3ce295a1e 100644 --- a/modules/integration_search/skins/default/no_keywords.html +++ b/modules/integration_search/skins/default/no_keywords.html @@ -2,6 +2,6 @@ {$lang->msg_no_keyword} - diff --git a/modules/integration_search/tpl/index.html b/modules/integration_search/tpl/index.html index faa6b3e44..f2f74d690 100644 --- a/modules/integration_search/tpl/index.html +++ b/modules/integration_search/tpl/index.html @@ -41,7 +41,7 @@ {$lang->cmd_insert} {$lang->cmd_delete} - diff --git a/modules/layout/layout.admin.view.php b/modules/layout/layout.admin.view.php index c701eacea..f0657dc7c 100644 --- a/modules/layout/layout.admin.view.php +++ b/modules/layout/layout.admin.view.php @@ -443,7 +443,7 @@ } if(count($style)) { - $script = ''; + $script = ''; Context::addHtmlHeader($script); } diff --git a/modules/layout/tpl/after_delete_config_image.html b/modules/layout/tpl/after_delete_config_image.html index a88425dcc..ad57ea3b8 100644 --- a/modules/layout/tpl/after_delete_config_image.html +++ b/modules/layout/tpl/after_delete_config_image.html @@ -1,4 +1,4 @@ - diff --git a/modules/layout/tpl/header.html b/modules/layout/tpl/header.html index 39407ab1b..768124b35 100644 --- a/modules/layout/tpl/header.html +++ b/modules/layout/tpl/header.html @@ -1,4 +1,4 @@ - diff --git a/modules/layout/tpl/include.multilang.textarea.html b/modules/layout/tpl/include.multilang.textarea.html index 5c702be3b..6ae68c964 100644 --- a/modules/layout/tpl/include.multilang.textarea.html +++ b/modules/layout/tpl/include.multilang.textarea.html @@ -1,5 +1,5 @@ - diff --git a/modules/layout/tpl/layout_all_instance_list.html b/modules/layout/tpl/layout_all_instance_list.html index b9c3ea247..b7a3d2ab1 100644 --- a/modules/layout/tpl/layout_all_instance_list.html +++ b/modules/layout/tpl/layout_all_instance_list.html @@ -1,4 +1,4 @@ - diff --git a/modules/layout/tpl/layout_edit.html b/modules/layout/tpl/layout_edit.html index f0fe3de94..14a1edeb5 100644 --- a/modules/layout/tpl/layout_edit.html +++ b/modules/layout/tpl/layout_edit.html @@ -15,7 +15,7 @@
  • {@$ext=substr(strrchr($file,'.'),1)}
    - diff --git a/modules/layout/tpl/layout_instance_list.html b/modules/layout/tpl/layout_instance_list.html index 07fc5e208..8256cd105 100644 --- a/modules/layout/tpl/layout_instance_list.html +++ b/modules/layout/tpl/layout_instance_list.html @@ -1,6 +1,6 @@ -

    {$layout_info->title} ver {$layout_info->version} ({$layout_info->layout})

    diff --git a/modules/layout/tpl/layout_modify.html b/modules/layout/tpl/layout_modify.html index 9a6b9c510..163c348ce 100644 --- a/modules/layout/tpl/layout_modify.html +++ b/modules/layout/tpl/layout_modify.html @@ -163,8 +163,11 @@
    - {$lang->instance_layout} {$lang->cmd_list} - {$selected_layout->title} ver {$selected_layout->version}({$selected_layout->layout}) {$lang->cmd_list} + + {$lang->cmd_list} + + {$lang->cmd_list} + diff --git a/modules/layout/tpl/top_refresh.html b/modules/layout/tpl/top_refresh.html index 4b5f7f6bc..76f474d8f 100644 --- a/modules/layout/tpl/top_refresh.html +++ b/modules/layout/tpl/top_refresh.html @@ -1,4 +1,4 @@ - diff --git a/modules/member/member.admin.view.php b/modules/member/member.admin.view.php index 9dbe7b3e6..4bfdad8b4 100644 --- a/modules/member/member.admin.view.php +++ b/modules/member/member.admin.view.php @@ -401,7 +401,7 @@
    - + EOD; }elseif($extendForm->column_type == 'jp_zip'){ $template = ''; diff --git a/modules/member/member.model.php b/modules/member/member.model.php index 29114a246..7c9b484e0 100644 --- a/modules/member/member.model.php +++ b/modules/member/member.model.php @@ -21,7 +21,15 @@ /** * @brief Return member's configuration **/ - function getMemberConfig() { + function getMemberConfig() + { + static $member_config; + + if($member_config) + { + return $member_config; + } + // Get member configuration stored in the DB $oModuleModel = &getModel('module'); $config = $oModuleModel->getModuleConfig('member'); @@ -65,6 +73,8 @@ if (!$config->signature_editor_skin || $config->signature_editor_skin == 'default') $config->signature_editor_skin = 'xpresseditor'; if (!$config->sel_editor_colorset) $config->sel_editor_colorset = 'white'; + $member_config = $config; + return $config; } diff --git a/modules/member/member.view.php b/modules/member/member.view.php index 696f67d87..ce07ebc87 100644 --- a/modules/member/member.view.php +++ b/modules/member/member.view.php @@ -47,6 +47,7 @@ $layout_info = $oLayoutModel->getLayout($this->member_config->layout_srl); if($layout_info) { + $this->module_info->layout_srl = $this->member_config->layout_srl; $this->setLayoutPath($layout_info->path); } } @@ -558,7 +559,7 @@ $extraList = $oMemberModel->getUsedJoinFormList(); $js_code = array(); - $js_code[] = ' - diff --git a/modules/module/tpl/module_grant_setup.html b/modules/module/tpl/module_grant_setup.html index 685732c7c..6159eb6e4 100644 --- a/modules/module/tpl/module_grant_setup.html +++ b/modules/module/tpl/module_grant_setup.html @@ -1,5 +1,5 @@ -

    {$lang->bundle_grant_setup}

    diff --git a/modules/module/tpl/module_grants.html b/modules/module/tpl/module_grants.html index 1a3de5166..4f4a81d80 100644 --- a/modules/module/tpl/module_grants.html +++ b/modules/module/tpl/module_grants.html @@ -1,7 +1,7 @@ - diff --git a/modules/module/tpl/move_filebox_list.html b/modules/module/tpl/move_filebox_list.html index 1a99ea511..97f9a7392 100644 --- a/modules/module/tpl/move_filebox_list.html +++ b/modules/module/tpl/move_filebox_list.html @@ -1,3 +1,3 @@ - \ No newline at end of file diff --git a/modules/module/tpl/top_refresh.html b/modules/module/tpl/top_refresh.html index df1b9981d..a739609df 100644 --- a/modules/module/tpl/top_refresh.html +++ b/modules/module/tpl/top_refresh.html @@ -1,4 +1,4 @@ - diff --git a/modules/page/tpl/page_content_modify.html b/modules/page/tpl/page_content_modify.html index 0c75e489a..70fe681de 100644 --- a/modules/page/tpl/page_content_modify.html +++ b/modules/page/tpl/page_content_modify.html @@ -41,7 +41,7 @@
    - diff --git a/modules/page/tpl/page_insert.html b/modules/page/tpl/page_insert.html index 762fb58be..1cfcff7e7 100644 --- a/modules/page/tpl/page_insert.html +++ b/modules/page/tpl/page_insert.html @@ -141,7 +141,7 @@ - diff --git a/modules/poll/skins/default/form.html b/modules/poll/skins/default/form.html index c55e51425..1687db72c 100644 --- a/modules/poll/skins/default/form.html +++ b/modules/poll/skins/default/form.html @@ -6,7 +6,7 @@ - diff --git a/modules/poll/skins/simple/form.html b/modules/poll/skins/simple/form.html index 8eb8787f5..6c67026a6 100644 --- a/modules/poll/skins/simple/form.html +++ b/modules/poll/skins/simple/form.html @@ -6,7 +6,7 @@ - diff --git a/modules/poll/tpl/poll_list.html b/modules/poll/tpl/poll_list.html index 448e7c486..67fb30a3d 100644 --- a/modules/poll/tpl/poll_list.html +++ b/modules/poll/tpl/poll_list.html @@ -1,4 +1,4 @@ - diff --git a/modules/rss/tpl/top_refresh.html b/modules/rss/tpl/top_refresh.html index 88de21065..b0c389886 100644 --- a/modules/rss/tpl/top_refresh.html +++ b/modules/rss/tpl/top_refresh.html @@ -1,4 +1,4 @@ - diff --git a/modules/trackback/tpl/trackback_list.html b/modules/trackback/tpl/trackback_list.html index 3c8cac19e..3690b05fe 100644 --- a/modules/trackback/tpl/trackback_list.html +++ b/modules/trackback/tpl/trackback_list.html @@ -1,4 +1,4 @@ - diff --git a/modules/widget/tpl/add_content_widget.html b/modules/widget/tpl/add_content_widget.html index d8967878c..913237692 100644 --- a/modules/widget/tpl/add_content_widget.html +++ b/modules/widget/tpl/add_content_widget.html @@ -22,7 +22,7 @@ {$editor} - diff --git a/modules/widget/tpl/js/widget.js b/modules/widget/tpl/js/widget.js index f9c1d1b0c..a0f294676 100644 --- a/modules/widget/tpl/js/widget.js +++ b/modules/widget/tpl/js/widget.js @@ -375,7 +375,7 @@ function doAddWidgetCode(widget_code) { var cssfile = request_uri+cssfile; if(typeof(document.createStyleSheet)=='undefined') { - var css =''; + var css =''; var dummy = xCreateElement("DIV"); xInnerHtml(dummy , css); document.body.appendChild(dummy); diff --git a/modules/widget/tpl/widget_generate_code.filebox.html b/modules/widget/tpl/widget_generate_code.filebox.html index 5140b6f8e..5b0f4100a 100644 --- a/modules/widget/tpl/widget_generate_code.filebox.html +++ b/modules/widget/tpl/widget_generate_code.filebox.html @@ -1,5 +1,5 @@ - @@ -35,7 +35,7 @@ - @@ -59,7 +59,7 @@ {$lang->cmd_set_multilingual} - @@ -83,7 +83,7 @@ - @@ -112,7 +112,7 @@ - @@ -216,7 +216,7 @@

    - @@ -235,6 +235,6 @@
    • - diff --git a/modules/widget/tpl/widget_generate_code.multilang.textarea.html b/modules/widget/tpl/widget_generate_code.multilang.textarea.html index 5c702be3b..6ae68c964 100644 --- a/modules/widget/tpl/widget_generate_code.multilang.textarea.html +++ b/modules/widget/tpl/widget_generate_code.multilang.textarea.html @@ -1,5 +1,5 @@ - diff --git a/modules/widget/tpl/widget_generate_code_in_page.html b/modules/widget/tpl/widget_generate_code_in_page.html index d14510ab6..cddf7ad81 100644 --- a/modules/widget/tpl/widget_generate_code_in_page.html +++ b/modules/widget/tpl/widget_generate_code_in_page.html @@ -4,7 +4,7 @@ -', - '' + '', + '' ), // error case - inline javascript array( diff --git a/tests/common/js/index.html b/tests/common/js/index.html index f4d691853..31d375efa 100644 --- a/tests/common/js/index.html +++ b/tests/common/js/index.html @@ -2,15 +2,15 @@ - - - - - - - - - + + + + + + + + +

    Common JavaScript Test

    diff --git a/themes/xe_greystone/layouts/xe_greystone/layout.html b/themes/xe_greystone/layouts/xe_greystone/layout.html index f9ff91726..90cd36bcb 100644 --- a/themes/xe_greystone/layouts/xe_greystone/layout.html +++ b/themes/xe_greystone/layouts/xe_greystone/layout.html @@ -7,8 +7,8 @@ - diff --git a/themes/xe_sapphire/layouts/xe_sapphire/layout.html b/themes/xe_sapphire/layouts/xe_sapphire/layout.html index 887e82810..51004f5bc 100644 --- a/themes/xe_sapphire/layouts/xe_sapphire/layout.html +++ b/themes/xe_sapphire/layouts/xe_sapphire/layout.html @@ -4,8 +4,8 @@ - diff --git a/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/layout.html b/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/layout.html index eea1c615b..e4c5d3b46 100644 --- a/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/layout.html +++ b/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/layout.html @@ -133,7 +133,7 @@ - diff --git a/themes/xe_solid_enterprise/modules/communication/send_message.html b/themes/xe_solid_enterprise/modules/communication/send_message.html index 50f29902e..3fb39ae22 100644 --- a/themes/xe_solid_enterprise/modules/communication/send_message.html +++ b/themes/xe_solid_enterprise/modules/communication/send_message.html @@ -36,6 +36,6 @@ - diff --git a/themes/xe_solid_enterprise/modules/member/login_form.html b/themes/xe_solid_enterprise/modules/member/login_form.html index 5777d25f9..d388dc569 100644 --- a/themes/xe_solid_enterprise/modules/member/login_form.html +++ b/themes/xe_solid_enterprise/modules/member/login_form.html @@ -2,7 +2,7 @@ - diff --git a/themes/xe_solid_enterprise/modules/member/modify_info.html b/themes/xe_solid_enterprise/modules/member/modify_info.html index 68f801df3..1b24657ce 100644 --- a/themes/xe_solid_enterprise/modules/member/modify_info.html +++ b/themes/xe_solid_enterprise/modules/member/modify_info.html @@ -5,7 +5,7 @@

    {$lang->msg_update_member}

    - @@ -70,6 +70,6 @@ - diff --git a/widgets/login_info/skins/xe_globalTwo/login_form.html b/widgets/login_info/skins/xe_globalTwo/login_form.html index f66fd7aa0..8c0651fa3 100644 --- a/widgets/login_info/skins/xe_globalTwo/login_form.html +++ b/widgets/login_info/skins/xe_globalTwo/login_form.html @@ -11,7 +11,7 @@ - @@ -71,6 +71,6 @@ - diff --git a/widgets/login_info/skins/xe_solid_enterprise_login/login_form.html b/widgets/login_info/skins/xe_solid_enterprise_login/login_form.html index 56142e116..fb3b72607 100644 --- a/widgets/login_info/skins/xe_solid_enterprise_login/login_form.html +++ b/widgets/login_info/skins/xe_solid_enterprise_login/login_form.html @@ -3,7 +3,7 @@ -