Commit c0ccb3917cd6c30f9f341cd8be2657f0b13f33c9
1 parent
369fdc38
Upgrade properly without the config/environment.php file existing.
git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@4984 c91229c3-7414-0410-bfa2-8a42b809f60b
Showing
1 changed file
with
3 additions
and
3 deletions
lib/upgrades/UpgradeFunctions.inc.php
| @@ -438,12 +438,12 @@ class UpgradeFunctions { | @@ -438,12 +438,12 @@ class UpgradeFunctions { | ||
| 438 | 438 | ||
| 439 | // {{{ createLdapAuthenticationProvider | 439 | // {{{ createLdapAuthenticationProvider |
| 440 | function createLdapAuthenticationProvider() { | 440 | function createLdapAuthenticationProvider() { |
| 441 | - global $default; | ||
| 442 | - $new_default = $default; | ||
| 443 | - $default = null; | ||
| 444 | if (!file_exists(KT_DIR . '/config/environment.php')) { | 441 | if (!file_exists(KT_DIR . '/config/environment.php')) { |
| 445 | return; | 442 | return; |
| 446 | } | 443 | } |
| 444 | + global $default; | ||
| 445 | + $new_default = $default; | ||
| 446 | + $default = null; | ||
| 447 | require_once(KT_DIR . '/config/environment.php'); | 447 | require_once(KT_DIR . '/config/environment.php'); |
| 448 | $old_default = $default; | 448 | $old_default = $default; |
| 449 | $default = $new_default; | 449 | $default = $new_default; |