Minahito
minah****@users*****
2006年 10月 15日 (日) 01:36:42 JST
Index: xoops2jp/html/modules/legacy/forms/SearchResultsForm.class.php
diff -u xoops2jp/html/modules/legacy/forms/SearchResultsForm.class.php:1.1.2.1 xoops2jp/html/modules/legacy/forms/SearchResultsForm.class.php:1.1.2.2
--- xoops2jp/html/modules/legacy/forms/SearchResultsForm.class.php:1.1.2.1 Sat Oct 14 23:55:25 2006
+++ xoops2jp/html/modules/legacy/forms/SearchResultsForm.class.php Sun Oct 15 01:36:41 2006
@@ -3,7 +3,7 @@
if (!defined('XOOPS_ROOT_PATH')) exit();
require_once XOOPS_ROOT_PATH . "/core/XCube_ActionForm.class.php";
-require_once XOOPS_MODULE_PATH . "/base/class/Legacy_Validator.class.php";
+require_once XOOPS_MODULE_PATH . "/legacy/class/Legacy_Validator.class.php";
class Legacy_SearchResultsForm extends XCube_ActionForm
{
@@ -30,7 +30,7 @@
//
$this->mFieldProperties['andor'] =& new XCube_FieldProperty($this);
$this->mFieldProperties['andor']->setDependsByArray(array('mask'));
- $this->mFieldProperties['andor']->addMessage('required', _MD_BASE_ERROR_MASK, _MD_BASE_LANG_ANDOR);
+ $this->mFieldProperties['andor']->addMessage('required', _MD_LEGACY_ERROR_MASK, _MD_LEGACY_LANG_ANDOR);
$this->mFieldProperties['andor']->addVar('mask', '/^(AND|OR|exact)$/i');
}
@@ -46,8 +46,8 @@
}
else {
$separator = '/[\s,]+/';
- if (defined('_MD_BASE_FORMAT_SEARCH_SEPARATOR')) {
- $separator = _MD_BASE_FORMAT_SEARCH_SEPARATOR;
+ if (defined('_MD_LEGACY_FORMAT_SEARCH_SEPARATOR')) {
+ $separator = _MD_LEGACY_FORMAT_SEARCH_SEPARATOR;
}
$tmpArr = preg_split($separator, $this->get('query'));
@@ -66,7 +66,7 @@
parent::validate();
if (!count($this->mQueries)) {
- $this->addErrorMessage(_MD_BASE_ERROR_SEARCH_QUERY_REQUIRED);
+ $this->addErrorMessage(_MD_LEGACY_ERROR_SEARCH_QUERY_REQUIRED);
}
}