[Jifty-commit] r560 - in jifty/trunk: lib/Jifty
jifty-commit at lists.jifty.org
jifty-commit at lists.jifty.org
Wed Feb 8 19:42:02 EST 2006
Author: alexmv
Date: Wed Feb 8 19:42:02 2006
New Revision: 560
Modified:
jifty/trunk/ (props changed)
jifty/trunk/lib/Jifty/Config.pm
jifty/trunk/lib/Jifty/Handler.pm
Log:
r8985 at zoq-fot-pik: chmrr | 2006-02-08 19:41:23 -0500
* Give users more rope to hang themselves with, by handing a whole
hash from the config file to Mason's config
Modified: jifty/trunk/lib/Jifty/Config.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Config.pm (original)
+++ jifty/trunk/lib/Jifty/Config.pm Wed Feb 8 19:42:02 2006
@@ -230,14 +230,16 @@
DefaultTemplateRoot => Jifty::Util->share_root . '/web/templates',
StaticRoot => "web/static",
TemplateRoot => "web/templates",
- Autoflush => 0,
- ErrorMode => 'fatal',
- ErrorFormat => 'text',
- DefaultEscapeFlags => 'h',
- Plugins => ['Jifty::Mason::Halo'],
+ MasonConfig => {
+ autoflush => 0,
+ error_mode => 'fatal',
+ error_format => 'text',
+ default_escape_flags => 'h',
+ plugins => ['Jifty::Mason::Halo'],
+ },
Globals => [],
- }
- }
+ },
+ },
};
}
Modified: jifty/trunk/lib/Jifty/Handler.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Handler.pm (original)
+++ jifty/trunk/lib/Jifty/Handler.pm Wed Feb 8 19:42:02 2006
@@ -59,11 +59,7 @@
[application => Jifty::Util->absolute_path( Jifty->config->framework('Web')->{'TemplateRoot'} )],
[jifty => Jifty->config->framework('Web')->{'DefaultTemplateRoot'}],
],
- default_escape_flags => Jifty->config->framework('Web')->{'DefaultEscapeFlags'},
- autoflush => Jifty->config->framework('Web')->{'Autoflush'},
- error_mode => Jifty->config->framework('Web')->{'ErrorMode'},
- error_format => Jifty->config->framework('Web')->{'ErrorFormat'},
- plugins => Jifty->config->framework('Web')->{'Plugins'},
+ %{ Jifty->config->framework('Web')->{'MasonConfig'} },
);
}
More information about the Jifty-commit
mailing list