aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorVirtualTam <virtualtam+github@flibidi.net>2017-10-17 22:39:29 +0200
committerGitHub <noreply@github.com>2017-10-17 22:39:29 +0200
commit1f40141a6992af6620962cba98b72f14de076615 (patch)
tree6e9fa6bdbf5dbc95fb3455e9d0fc7f15462d9603
parent839566500c31c139ad5e1ddd728633869c118a44 (diff)
parent710291b164421663b9b1cf1f866e957801ff83e0 (diff)
downloadShaarli-1f40141a6992af6620962cba98b72f14de076615.tar.gz
Shaarli-1f40141a6992af6620962cba98b72f14de076615.tar.zst
Shaarli-1f40141a6992af6620962cba98b72f14de076615.zip
Merge pull request #996 from virtualtam/fix/user-css
Fix: enable access to data/user.css (Apache 2.2 & 2.4)
-rw-r--r--.editorconfig2
-rw-r--r--data/.htaccess12
2 files changed, 10 insertions, 4 deletions
diff --git a/.editorconfig b/.editorconfig
index 5abbd7bf..4a6589a2 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -10,7 +10,7 @@ trim_trailing_whitespace = true
10indent_style = space 10indent_style = space
11indent_size = 4 11indent_size = 4
12 12
13[*.{html,xml}] 13[*.{htaccess,html,xml}]
14indent_size = 2 14indent_size = 2
15 15
16[*.php] 16[*.php]
diff --git a/data/.htaccess b/data/.htaccess
index f601c1ee..1d49da37 100644
--- a/data/.htaccess
+++ b/data/.htaccess
@@ -1,10 +1,16 @@
1<IfModule version_module> 1<IfModule version_module>
2 <IfVersion >= 2.4> 2 <IfVersion >= 2.4>
3 Require all denied 3 Require all denied
4 <Files "user.css">
5 Require all granted
6 </Files>
4 </IfVersion> 7 </IfVersion>
5 <IfVersion < 2.4> 8 <IfVersion < 2.4>
6 Allow from none 9 Allow from none
7 Deny from all 10 Deny from all
11 <Files "user.css">
12 Allow from all
13 </Files>
8 </IfVersion> 14 </IfVersion>
9</IfModule> 15</IfModule>
10 16