diff --git a/doc/pages/.fuse_hidden000003f600000012 b/doc/pages/.fuse_hidden000003f600000012 deleted file mode 100644 index e69de29..0000000 diff --git a/doc/pages/.fuse_hidden000003f000000011 b/examples/blog/config/settings.uce similarity index 100% rename from doc/pages/.fuse_hidden000003f000000011 rename to examples/blog/config/settings.uce diff --git a/examples/blog/index.uce b/examples/blog/index.uce index 12ea541..0d3da24 100644 --- a/examples/blog/index.uce +++ b/examples/blog/index.uce @@ -1,9 +1,10 @@ +#load "config/settings.uce" #load "lib.uce" RENDER() { <> - Hello world2 + Hello world23 = bla("!x") ?> > } diff --git a/src/lib/compiler.cpp b/src/lib/compiler.cpp index 1ce7295..1360ee3 100644 --- a/src/lib/compiler.cpp +++ b/src/lib/compiler.cpp @@ -152,10 +152,11 @@ String preprocess_shared_unit_char_wise(Request* context, SharedUnit* su, String pc.resize(pc.length() - current_line.length()); nibble(current_line, "\""); String unit_name = nibble(current_line, "\""); + //printf("(i) #load %s\n", unit_name.c_str()); SharedUnit* sub_su = compiler_load_shared_unit(context, unit_name, su->src_path, true); if(sub_su) { - pc.append("#include \"" + sub_su->pre_file_name + "\""); + pc.append("#include \"" + sub_su->bin_path + "/" + sub_su->pre_file_name + "\"\n"); } } else if(current_line.length() == 4 && current_line.substr(0, 4) == "API ") diff --git a/test/index.uce b/test/index.uce index dad8973..3d7272d 100644 --- a/test/index.uce +++ b/test/index.uce @@ -26,7 +26,7 @@ RENDER()
+print(shell_exec("echo "+shell_escape("kasjdf 1ölkasj öflkjasdö\\lkfjsöa'ldkfj 23487692\"bla83746"))); ?>+Git+ ++ + print(shell_exec("git show")); + + ?>+= var_dump(context->params) ?>