diff --git a/admin/setting/template/smileyedit.htm b/admin/setting/template/smileyedit.htm index d4fd8c3..ff0fd77 100644 --- a/admin/setting/template/smileyedit.htm +++ b/admin/setting/template/smileyedit.htm @@ -63,15 +63,15 @@ {lang batch_code_set_expression} - + - + + + - +    diff --git a/core/class/table/table_resources_event.php b/core/class/table/table_resources_event.php index 0c78ef5..733e84a 100644 --- a/core/class/table/table_resources_event.php +++ b/core/class/table/table_resources_event.php @@ -365,14 +365,12 @@ class table_resources_event extends dzz_table foreach ($condition as $k => $v) { if (!is_array($v)) { $connect = 'and'; - $wheresql .= $connect . ' e.' . $k . " = %s "; - $params[] = $v; + $wheresql .= $connect . ' e.' . $k . " = '" . $v . "' "; } else { $relative = isset($v[1]) ? $v[1] : '='; $connect = isset($v[2]) ? $v[2] : 'and'; if ($relative == 'in') { - $wheresql .= $connect . " e." . $k . " in (%n) "; - $params[]=$v[0]; + $wheresql .= $connect . " e." . $k . " " . $relative . " (" . $v[0] . ") "; } elseif ($relative == 'nowhere') { continue; } elseif ($relative == 'stringsql') { @@ -381,8 +379,7 @@ class table_resources_event extends dzz_table $wheresql .= $connect . " e." . $k . " like %s "; $params[] = '%' . $v[0] . '%'; } else { - $wheresql .= $connect . ' e.' . $k . ' = %s '; - $params[]=$v[0] ; + $wheresql .= $connect . ' e.' . $k . ' ' . $relative . ' ' . $v[0] . ' '; } } diff --git a/core/template/default/common/header_simple_start.htm b/core/template/default/common/header_simple_start.htm index d09833b..32e2a96 100644 --- a/core/template/default/common/header_simple_start.htm +++ b/core/template/default/common/header_simple_start.htm @@ -10,28 +10,29 @@ - - + + + - + + + + - - - - - + - + +