merge 1.4.5.10

git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@9272 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
flyskyko 2011-09-22 08:23:36 +00:00
commit 105e3f4843
66 changed files with 4864 additions and 214 deletions

View file

@ -20,7 +20,7 @@
$oModuleModel = &getModel('module');
$this->config = $oModuleModel->getModuleConfig('integration_search');
Context::set('config',$this->config);
$this->setTemplatePath($this->module_path."/tpl/");
}
@ -50,6 +50,9 @@
Context::set('mid_list',$module_categories);*/
$security = new Security();
$security->encodeHTML('skin_list..title');
// Sample Code
Context::set('sample_code', htmlspecialchars('<form action="{getUrl()}" method="get"><input type="hidden" name="vid" value="{$vid}" /><input type="hidden" name="mid" value="{$mid}" /><input type="hidden" name="act" value="IS" /><input type="text" name="is_keyword" class="inputTypeText" value="{$is_keyword}" /><span class="button"><input type="submit" value="{$lang->cmd_search}" /></span></form>') );
@ -74,8 +77,11 @@
}
}
Context::set('skin_info', $skin_info);
Context::set('skin_vars', $skin_vars);
Context::set('skin_vars', $skin_vars); //maybe not used
$security = new Security();
$security->encodeHTML('skin_info...');
$this->setTemplateFile("skin_info");
}
}