Merge branch 'master' into dev

This commit is contained in:
Claude 2019-04-08 15:12:25 +02:00
commit e579784507
3 changed files with 7 additions and 11 deletions

View File

@ -100,10 +100,10 @@ The language setting in config/stikked.php is back, you can set a fixed language
$config['language'] = 'english'; $config['language'] = 'english';
``` ```
New config option: Content expiration. New config option: Content expiration. \
Sets the "Expires:"-header to make use of browser-caching Sets the "Expires:"-header to make use of browser-caching \
Format: http://php.net/manual/en/function.strtotime.php Format: http://php.net/manual/en/function.strtotime.php \
Examples: '+10 seconds', '+1 year', '-1 week' Examples: '+10 seconds', '+1 year', '-1 week' \
Browser-caching is disabled when this option is not set. Browser-caching is disabled when this option is not set.
```php ```php

View File

@ -101,7 +101,7 @@ $config['charset'] = 'UTF-8';
| setting this variable to TRUE (boolean). See the user guide for details. | setting this variable to TRUE (boolean). See the user guide for details.
| |
*/ */
$config['enable_hooks'] = TRUE; $config['enable_hooks'] = FALSE;
/* /*

View File

@ -10,11 +10,7 @@
| |
*/ */
$hook['pre_controller'][] = array(
'function' => 'pick_language',
'filename' => 'pick_language.php',
'filepath' => 'hooks'
);
/* End of file hooks.php */ /* End of file hooks.php */
/* Location: ./application/config/hooks.php */ /* Location: ./application/config/hooks.php */