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

updated: to the new Ezc API

Browse Source 
git-svn-id: svn://ttmath.org/publicrep/winix/trunk@983 e52654a7-88a9-db11-a3e9-0013d4bc506e
This commit is contained in:
Tomasz Sowa
2014-10-28 19:14:46 +00:00
parent 4fda06b547
commit 1100cf75d7
20 changed files with 933 additions and 957 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
plugins/menu/templates.cpp
View File

@@ -240,19 +240,19 @@ void menu_dir_init(Info & i)
bool with_meta = false;
if( i.params.size() >= 2 )
param = string_to_param(i.params[1]);
param = string_to_param(i.params[1].str);
if( i.params.size() >=3 && i.params[2] == L"withmeta" )
if( i.params.size() >=3 && i.params[2].str == L"withmeta" )
with_meta = true;
if( i.params.empty() || i.params[0].empty() )
if( i.params.empty() || i.params[0].str.empty() )
{
menu_dir_init(i, cur->request->dir_tab.back()->id, param, with_meta);
}
else
if( !i.params.empty() )
{
if( i.params[0] == L"current" )
if( i.params[0].str == L"current" )
{
if( stack->fun_data )
{
@@ -263,19 +263,19 @@ void menu_dir_init(Info & i)
}
}
else
if( i.params[0] == L"this" )
if( i.params[0].str == L"this" )
{
menu_dir_init(i, cur->request->dir_tab.back()->id, param, with_meta);
}
else
if( !i.params[0].empty() && i.params[0][0] != '/' )
if( !i.params[0].str.empty() && i.params[0].str[0] != '/' )
{
log << log1 << "Menu: path for a menu should not be relative" << logend;
return;
}
else
{
menu_dir_init(i, i.params[0], param, with_meta);
menu_dir_init(i, i.params[0].str, param, with_meta);
}
}
}