projects
/
mtweb
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
upgrade 0.11.2 pour XML, MySql et SQLite
[mtweb]
/
mw
/
env
/
modules
/
mw_env_out.php
diff --git
a/mw/env/modules/mw_env_out.php
b/mw/env/modules/mw_env_out.php
index
f405fca
..
998f489
100644
(file)
--- a/
mw/env/modules/mw_env_out.php
+++ b/
mw/env/modules/mw_env_out.php
@@
-112,7
+112,7
@@
function out_url($file, $PRIORITE = "DESC"){
$out_file = $this->_out_file($file, $PRIORITE);
function out_url($file, $PRIORITE = "DESC"){
$out_file = $this->_out_file($file, $PRIORITE);
- return $out_file ? $this->path("mw_path").$out_file : $file;
+ return $out_file ? $this->path("
web").$this->path("
mw_path").$out_file : $file;
}
function _out_file($file, $PRIORITE = "DESC"){
}
function _out_file($file, $PRIORITE = "DESC"){
@@
-221,7
+221,7
@@
function out_config($name){
if(isset($this->out_config)){
$CONFIG = $this->get_CONFIG();
function out_config($name){
if(isset($this->out_config)){
$CONFIG = $this->get_CONFIG();
- return isset($CONFIG["out_".$name]) ? $CONFIG["out_".$name] :
$this->out_config[$name]["default"]
;
+ return isset($CONFIG["out_".$name]) ? $CONFIG["out_".$name] :
(isset($this->out_config[$name]) ? $this->out_config[$name]["default"] : "")
;
}
return null;
}
}
return null;
}
@@
-385,6
+385,7
@@
($init_script = $this->init_script())
&& $this->out_file_exists($init_script)
) require $this->out_file($init_script);
($init_script = $this->init_script())
&& $this->out_file_exists($init_script)
) require $this->out_file($init_script);
+ $data = $this->data();
if($layout["page"]){
if($this->out_file_exists($layout["page"])) require $this->out_file($layout["page"]);
}
if($layout["page"]){
if($this->out_file_exists($layout["page"])) require $this->out_file($layout["page"]);
}
@@
-406,7
+407,12
@@
}
function get_out_config(){
}
function get_out_config(){
- return array();
+ $out_config = array();
+ if($this->ENV_SET){
+ $env = $this->modules["env"];
+ $out_config = $env->get_out_config();
+ }
+ return $out_config;
}
function set_template_infos($template_infos){
}
function set_template_infos($template_infos){