mirror of
https://github.com/claudehohl/Stikked.git
synced 2025-04-25 04:21:17 -05:00
Merge branch 'master' into dev
This commit is contained in:
commit
e579784507
@ -100,10 +100,10 @@ The language setting in config/stikked.php is back, you can set a fixed language
|
||||
$config['language'] = 'english';
|
||||
```
|
||||
|
||||
New config option: Content expiration.
|
||||
Sets the "Expires:"-header to make use of browser-caching
|
||||
Format: http://php.net/manual/en/function.strtotime.php
|
||||
Examples: '+10 seconds', '+1 year', '-1 week'
|
||||
New config option: Content expiration. \
|
||||
Sets the "Expires:"-header to make use of browser-caching \
|
||||
Format: http://php.net/manual/en/function.strtotime.php \
|
||||
Examples: '+10 seconds', '+1 year', '-1 week' \
|
||||
Browser-caching is disabled when this option is not set.
|
||||
|
||||
```php
|
||||
|
@ -101,7 +101,7 @@ $config['charset'] = 'UTF-8';
|
||||
| setting this variable to TRUE (boolean). See the user guide for details.
|
||||
|
|
||||
*/
|
||||
$config['enable_hooks'] = TRUE;
|
||||
$config['enable_hooks'] = FALSE;
|
||||
|
||||
|
||||
/*
|
||||
|
@ -10,11 +10,7 @@
|
||||
|
|
||||
*/
|
||||
|
||||
$hook['pre_controller'][] = array(
|
||||
'function' => 'pick_language',
|
||||
'filename' => 'pick_language.php',
|
||||
'filepath' => 'hooks'
|
||||
);
|
||||
|
||||
|
||||
/* End of file hooks.php */
|
||||
/* Location: ./application/config/hooks.php */
|
||||
/* Location: ./application/config/hooks.php */
|
Loading…
x
Reference in New Issue
Block a user