X-Git-Url: https://git.tokkee.org/?p=pkg-mlmmj.git;a=blobdiff_plain;f=debian%2Fpatches%2F02_fix_mlmmj_php.dpatch;fp=debian%2Fpatches%2F02_fix_mlmmj_php.dpatch;h=34f8bb759ac72b9a3c93fd1a80b89c82c86f61d5;hp=5be580403ca5780c5f149ac83adada6b750b951e;hb=4ce116d4c25ac7592b462356a64f53e6fd1fa398;hpb=4ab71635478b06bc83edf4aa53a4b5d3b370c48e

diff --git a/debian/patches/02_fix_mlmmj_php.dpatch b/debian/patches/02_fix_mlmmj_php.dpatch
index 5be5804..34f8bb7 100644
--- a/debian/patches/02_fix_mlmmj_php.dpatch
+++ b/debian/patches/02_fix_mlmmj_php.dpatch
@@ -1,7 +1,8 @@
 #! /bin/sh /usr/share/dpatch/dpatch-run
 ## 02_fix_mlmmj_php.dpatch by Søren Boll Overgaard <boll@tristram.fork.dk>
 ##
-## DP: Adapt pathes used in the web interface to match the installation paths.
+## DP: Adapt pathes and settings used in the web interface to match the
+## DP: installation paths.
 
 @DPATCH@
 
@@ -19,14 +20,13 @@ diff a/contrib/web/php-admin/conf/config.php b/contrib/web/php-admin/conf/config
 diff a/contrib/web/php-admin/htdocs/dot.htaccess b/contrib/web/php-admin/htdocs/dot.htaccess
 --- a/contrib/web/php-admin/htdocs/dot.htaccess
 +++ b/contrib/web/php-admin/htdocs/dot.htaccess
-@@ -1,4 +1,5 @@
+@@ -1,4 +1,4 @@
  Require valid-user
  AuthType Basic
 -AuthName "mlmmj web-interface"
 -AuthUserFile /home/mlmmj/htpasswd
 +AuthName "mlmmj web-interface on Debian GNU/Linux"
 +AuthUserFile /etc/mlmmj-php-web-admin/htpasswd
-+php_value include_path "/usr/share/mlmmj-php-web-admin"
 diff a/contrib/web/php-admin/htdocs/edit.php b/contrib/web/php-admin/htdocs/edit.php
 --- a/contrib/web/php-admin/htdocs/edit.php
 +++ b/contrib/web/php-admin/htdocs/edit.php