From: Alexander Ebert Date: Tue, 4 Dec 2012 17:54:53 +0000 (+0100) Subject: Major API overhaul X-Git-Tag: 2.0.0_Beta_1~616^2~10 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=ba42b9c560c3441aca68b52ff63bc2f5982dc3e6;p=GitHub%2FWoltLab%2FWCF.git Major API overhaul --- diff --git a/files/lib/acp/form/LanguageExportForm.class.php b/files/lib/acp/form/LanguageExportForm.class.php index e6f79b288b..eb82b94402 100644 --- a/files/lib/acp/form/LanguageExportForm.class.php +++ b/files/lib/acp/form/LanguageExportForm.class.php @@ -144,15 +144,9 @@ class LanguageExportForm extends ACPForm { * Read available packages. */ protected function readPackages() { - $sql = "SELECT package.*, + $sql = "SELECT *, CASE WHEN instanceName <> '' THEN instanceName ELSE packageName END AS packageName - FROM wcf".WCF_N."_package_dependency package_dependency - LEFT JOIN wcf".WCF_N."_language_to_package language_to_package - ON (language_to_package.languageID = ? AND language_to_package.packageID = package_dependency.dependency) - LEFT JOIN wcf".WCF_N."_package package - ON (package.packageID = package_dependency.dependency) - WHERE package_dependency.packageID = ".PACKAGE_ID." - AND language_to_package.languageID IS NOT NULL + FROM wcf".WCF_N."_package ORDER BY packageName"; $statement = WCF::getDB()->prepareStatement($sql); $statement->execute(array($this->languageID)); diff --git a/files/lib/acp/form/LanguageMultilingualismForm.class.php b/files/lib/acp/form/LanguageMultilingualismForm.class.php index 59fb639ccd..c1aaaba2b1 100644 --- a/files/lib/acp/form/LanguageMultilingualismForm.class.php +++ b/files/lib/acp/form/LanguageMultilingualismForm.class.php @@ -90,7 +90,7 @@ class LanguageMultilingualismForm extends ACPForm { LanguageEditor::enableMultilingualism(($this->enable == 1 ? $this->languageIDs : array())); // clear cache - CacheHandler::getInstance()->clear(WCF_DIR.'cache/', 'cache.languages.php'); + CacheHandler::getInstance()->clear(WCF_DIR.'cache/', 'cache.language.php'); $this->saved(); // show success message