diff options
| author | Max Kremmel <xing@synapse.plus.com> | 2005-07-25 20:02:12 +0000 |
|---|---|---|
| committer | Max Kremmel <xing@synapse.plus.com> | 2005-07-25 20:02:12 +0000 |
| commit | 17547211c1c3973e0239695ffdffe059d020f010 (patch) | |
| tree | 29341353b58fac2b4384ab724eb984a88f53a516 /BitLanguage.php | |
| parent | b8b71e4e4920dd788974bba8f984d267a4d8287b (diff) | |
| download | languages-17547211c1c3973e0239695ffdffe059d020f010.tar.gz languages-17547211c1c3973e0239695ffdffe059d020f010.tar.bz2 languages-17547211c1c3973e0239695ffdffe059d020f010.zip | |
Merge recent changes R1 1.0.2 beta --> HEAD
Diffstat (limited to 'BitLanguage.php')
| -rw-r--r-- | BitLanguage.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/BitLanguage.php b/BitLanguage.php index df6c093..15a7d6d 100644 --- a/BitLanguage.php +++ b/BitLanguage.php @@ -14,7 +14,7 @@ // +----------------------------------------------------------------------+ // | Authors: spider <spider@steelsun.com> // +----------------------------------------------------------------------+ -// $Id: BitLanguage.php,v 1.4 2005/07/17 17:36:07 squareing Exp $ +// $Id: BitLanguage.php,v 1.5 2005/07/25 20:02:11 squareing Exp $ class BitLanguage extends BitBase { // list of available (non-disabled) languages @@ -370,10 +370,10 @@ class BitLanguage extends BitBase { $sourceHash = $this->getSourceHash( $pString ); $query = "SELECT `tran`, tivm.`version`, tivm.`source_hash` AS `usage_source_hash` FROM `".BIT_DB_PREFIX."tiki_i18n_masters` tim - LEFT OUTER JOIN `".BIT_DB_PREFIX."tiki_i18n_strings` tis ON( tim.`source_hash`=tis.`source_hash` AND `lang_code`=? ) LEFT OUTER JOIN `".BIT_DB_PREFIX."tiki_i18n_version_map` tivm ON( tivm.`source_hash`=tim.`source_hash` AND tivm.`version`=? ) + LEFT OUTER JOIN `".BIT_DB_PREFIX."tiki_i18n_strings` tis ON( tim.`source_hash`=tis.`source_hash` AND `lang_code`=? ) WHERE tim.`source_hash`=?"; - $ret = $this->mDb->GetRow($query, array( $pLangCode, BIT_MAJOR_VERSION , $sourceHash ) ); + $ret = $this->mDb->GetRow($query, array( BIT_MAJOR_VERSION, $pLangCode, $sourceHash ) ); if( $pOverrideUsage && $gBitSystem->isFeatureActive( 'record_untranslated' ) ) { $query = "SELECT `source_hash` FROM `".BIT_DB_PREFIX."tiki_i18n_masters` WHERE `source_hash`=?"; $source = $this->GetOne($query, array( $this->getSourceHash( $pString ) ) ); |