diff options
| author | Claude <longneck@scratchbook.ch> | 2019-04-08 15:12:25 +0200 |
|---|---|---|
| committer | Claude <longneck@scratchbook.ch> | 2019-04-08 15:12:25 +0200 |
| commit | e5797845078f4b1f3ce9441eea9d4c355cbe12b7 (patch) | |
| tree | f89ca2f3a57837763b9fef8a17f9988c53523b5f | |
| parent | a5c44e536c842c6c5fb503388f00a00ba90c3708 (diff) | |
| parent | 16f2864fa27ef025878b824a12a041284ec94275 (diff) | |
| download | stikked-fit-e5797845078f4b1f3ce9441eea9d4c355cbe12b7.tar.gz stikked-fit-e5797845078f4b1f3ce9441eea9d4c355cbe12b7.tar.bz2 stikked-fit-e5797845078f4b1f3ce9441eea9d4c355cbe12b7.zip | |
Merge branch 'master' into dev
| -rw-r--r-- | README.md | 8 | ||||
| -rw-r--r-- | htdocs/application/config/config.php | 2 | ||||
| -rw-r--r-- | htdocs/application/config/hooks.php | 8 |
3 files changed, 7 insertions, 11 deletions
@@ -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 diff --git a/htdocs/application/config/config.php b/htdocs/application/config/config.php index 7d2b164..d2feb65 100644 --- a/htdocs/application/config/config.php +++ b/htdocs/application/config/config.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; /* diff --git a/htdocs/application/config/hooks.php b/htdocs/application/config/hooks.php index 6e41765..a4ad2be 100644 --- a/htdocs/application/config/hooks.php +++ b/htdocs/application/config/hooks.php @@ -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 */
\ No newline at end of file |