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

the first part of reimplementing has been done

Browse Source 
now we have app object and singletons are only: log logn plugin and app



git-svn-id: svn://ttmath.org/publicrep/winix/trunk@628 e52654a7-88a9-db11-a3e9-0013d4bc506e
This commit is contained in:
Tomasz Sowa
2010-08-10 16:12:50 +00:00
parent 6897192364
commit 217cf1420b
191 changed files with 9529 additions and 7250 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
templates/misc.cpp
View File

@@ -8,7 +8,6 @@
*/
#include "../core/data.h"
#include "../core/misc.h"
#include "../core/request.h"
#include "templates.h"
@@ -40,13 +39,13 @@ int ParseCKeditorFun()
{
ckeditor_getparser.fun_num = 2; // default if there is a problem with parsing info
if( !request.get_table.empty() )
if( !request->get_table.empty() )
{
size_t last = request.get_table.size()-1;
size_t last = request->get_table.size()-1;
if( !request.get_table[last].empty() )
if( !request->get_table[last].empty() )
{
const char * str = request.get_table[last].c_str() + 1; // the first char is '?'
const char * str = request->get_table[last].c_str() + 1; // the first char is '?'
ckeditor_getparser.Parse(str);
}
}
@@ -70,7 +69,7 @@ void Read(Patterns & patterns, size_t pat, Locale & locale, LocaleFilter & local
if( pat < patterns[i].size() )
{
patterns[i][pat].DeleteWhiteTextItems(delete_white);
patterns[i][pat].Directory(data.templates_dir, data.templates_dir_default);
patterns[i][pat].Directory(config->templates_dir, config->templates_dir_default);
patterns[i][pat].ParseFile(file);
locale_filter.Filter(patterns[i][pat], locale, static_cast<Locale::Lang>(i));