Commit 834d2b4bff981d3cdde17d6affea6403e9b0958f
1 parent
3404150a
Merged in from DEV trunk...
KTS-3112 "Fatal error on new installation when directed to login.php line 168" Re-applied. This was not the issue. upgrade.php had not run successfully. Committed By: Kevin Fourie Reviewed By: Conrad Vermeulen git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/STABLE/trunk@8213 c91229c3-7414-0410-bfa2-8a42b809f60b
Showing
1 changed file
with
10 additions
and
14 deletions
login.php
| ... | ... | @@ -166,19 +166,15 @@ class LoginPageDispatcher extends KTDispatcher { |
| 166 | 166 | $aLanguageNames = $oReg->getLanguages('knowledgeTree'); |
| 167 | 167 | $aRegisteredLanguageNames = array(); |
| 168 | 168 | |
| 169 | - if (empty($aRegisteredLangs)) | |
| 170 | - { | |
| 171 | - $query = "DELETE FROM plugin_helper"; | |
| 172 | - DBUtil::runQuery($query); | |
| 173 | - redirect($_SERVER['REQUEST_URI']); | |
| 174 | - exit; | |
| 175 | - } | |
| 176 | - else | |
| 177 | - { | |
| 178 | - foreach (array_keys($aRegisteredLangs) as $sLang) | |
| 179 | - { | |
| 180 | - $aRegisteredLanguageNames[$sLang] = $aLanguageNames[$sLang]; | |
| 181 | - } | |
| 169 | + if(emtpy($aRegisteredLangs)) { | |
| 170 | + $query = "DELETE FROM plugin_helper"; | |
| 171 | + DBUtil::runQuery($query); | |
| 172 | + redirect($_SERVER['REQUEST_URI']); | |
| 173 | + exit; | |
| 174 | + } else { | |
| 175 | + foreach (array_keys($aRegisteredLangs) as $sLang) { | |
| 176 | + $aRegisteredLanguageNames[$sLang] = $aLanguageNames[$sLang]; | |
| 177 | + } | |
| 182 | 178 | } |
| 183 | 179 | $sLanguageSelect = $default->defaultLanguage; |
| 184 | 180 | |
| ... | ... | @@ -391,4 +387,4 @@ function checkLastSessionUserID($userId) |
| 391 | 387 | $dispatcher =& new LoginPageDispatcher(); |
| 392 | 388 | $dispatcher->dispatch(); |
| 393 | 389 | |
| 394 | -?> | |
| 395 | 390 | \ No newline at end of file |
| 391 | +?> | ... | ... |