tomasz.sowa/winix
1
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

updated to the new version of ezc

Browse Source 
git-svn-id: svn://ttmath.org/publicrep/winix/trunk@621 e52654a7-88a9-db11-a3e9-0013d4bc506e
This commit is contained in:
Tomasz Sowa
2010-07-19 23:07:34 +00:00
parent 62a0e52092
commit 93da32cfb3
20 changed files with 50 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
templates/indexpatterns.cpp
View File

@@ -74,7 +74,7 @@ void IndexPatterns::ReadPattern(Tab::iterator & iter, Locale & locale, LocaleFil
for(i=0 ; i<len ; ++i)
{
templ.patterns[i].delete_all_white = delete_white;
templ.patterns[i].DeleteWhiteTextItems(delete_white);
templ.patterns[i].Directory(data.templates_dir, data.templates_dir_default);
templ.patterns[i].ParseFile(iter->first);

2
templates/misc.cpp
View File

@@ -69,7 +69,7 @@ void Read(Patterns & patterns, size_t pat, Locale & locale, LocaleFilter & local
{
if( pat < patterns[i].size() )
{
patterns[i][pat].delete_all_white = delete_white;
patterns[i][pat].DeleteWhiteTextItems(delete_white);
patterns[i][pat].Directory(data.templates_dir, data.templates_dir_default);
patterns[i][pat].ParseFile(file);

2
templates/patterncacher.cpp
View File

@@ -56,7 +56,7 @@ void PatternCacher::CheckTableSize()
void PatternCacher::CreatePattern(const Item & item, Ezc::Pattern & pattern)
{
pattern.allow_include = false;
pattern.AllowInclude(false);
pattern.ParseString(item.content);
}

11
templates/templates.cpp
View File

@@ -28,8 +28,9 @@ Locale locale;
LocaleFilter locale_filter;
CKEditorGetParser ckeditor_getparser;
const std::string empty; // used by GenerateRunRaw()
// used by GenerateRunRaw()
std::vector<std::string> empty_pars;
const std::string empty_string;
@@ -620,8 +621,12 @@ using namespace TemplatesFunctions;
void Templates::GenerateRunRaw()
{
using namespace TemplatesFunctions;
if( !empty_pars.empty() )
empty_pars.clear();
Ezc::Info info(request.page, empty_pars, empty_string);
Ezc::Info info(request.page, empty);
info.iter = 0;
info.res = false;