comparison: davical/davical.patch
davical/davical.patch
- changeset 296
- fdacb8355f94
- parent 294
- 88d9122d2641
- child 361
- 45eaa38991fd
equal
deleted
inserted
replaced
| 1:7db9c674d0ee | 2:ac72831dc0fd |
|---|---|
| 150 +if ( @file_exists("@l_prefix@/etc/davical/davical-config.php") ) { | 150 +if ( @file_exists("@l_prefix@/etc/davical/davical-config.php") ) { |
| 151 + include_once("@l_prefix@/etc/davical/davical-config.php"); | 151 + include_once("@l_prefix@/etc/davical/davical-config.php"); |
| 152 } | 152 } |
| 153 else if ( @file_exists('config/config.php') ) { | 153 else if ( @file_exists('config/config.php') ) { |
| 154 include('config/config.php'); | 154 include('config/config.php'); |
| 155 Index: davical-0.9.9.3/dba/views/dav_principal.sql | |
| 156 --- davical-0.9.9.3/dba/views/dav_principal.sql.orig 2010-02-23 11:29:07.000000000 +0100 | |
| 157 +++ davical-0.9.9.3/dba/views/dav_principal.sql 2010-11-22 14:33:59.832463699 +0100 | |
| 158 @@ -2,7 +2,7 @@ | |
| 159 -- record 1:1 with the principal table | |
| 160 | |
| 161 | |
| 162 -DROP VIEW dav_principal CASCADE; | |
| 163 +DROP VIEW IF EXISTS dav_principal CASCADE; | |
| 164 CREATE OR REPLACE VIEW dav_principal AS | |
| 165 SELECT user_no, usr.active AS user_active, joined AS created, updated AS modified, | |
| 166 username, password, fullname, email, |
