From e5ba4abcf829abd480672139c53109a531f79943 Mon Sep 17 00:00:00 2001 From: Claude Date: Tue, 2 Oct 2018 11:44:19 +0200 Subject: Update README.md linebreaks --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index d7f8bfc..5dc91aa 100644 --- a/README.md +++ b/README.md @@ -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 -- cgit v1.2.3 From 9edcff65daef96e558551630e048d102e8d4e985 Mon Sep 17 00:00:00 2001 From: Claude Date: Tue, 2 Oct 2018 11:45:15 +0200 Subject: Update README.md linebreaks reloaded --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 5dc91aa..9db59a0 100644 --- a/README.md +++ b/README.md @@ -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 -- cgit v1.2.3 From e8e0fd123c9fbc77181d75e14c6acab08838132e Mon Sep 17 00:00:00 2001 From: larry_the_cow Date: Wed, 21 Nov 2018 23:54:26 +0000 Subject: Commit 6da09613 deleted htdocs/application/hooks/pick_language.php to fix #264, but it did not remove the hook from htdocs/application/config/hooks.php. This commit reverts htdocs/application/config/hooks.php back to f97a5331 and disables $config['enable_hooks'] in htdocs/application/config/config.php. It was introduced in b69c6650. --- htdocs/application/config/config.php | 2 +- htdocs/application/config/hooks.php | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-) 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 -- cgit v1.2.3