diff options
| author | Max Kremmel <xing@synapse.plus.com> | 2005-08-07 21:11:47 +0000 |
|---|---|---|
| committer | Max Kremmel <xing@synapse.plus.com> | 2005-08-07 21:11:47 +0000 |
| commit | e76eebb8bd8b3fe8f69c9b2236879d5563cab62a (patch) | |
| tree | bb5a6788b48f285bdf04bb6411dfda9d517b9772 /BitLanguage.php | |
| parent | 77929a9da7c00611bb2f0f20b27591c264eeba06 (diff) | |
| download | languages-e76eebb8bd8b3fe8f69c9b2236879d5563cab62a.tar.gz languages-e76eebb8bd8b3fe8f69c9b2236879d5563cab62a.tar.bz2 languages-e76eebb8bd8b3fe8f69c9b2236879d5563cab62a.zip | |
merge recent changes from R1 to 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 53ca65d..e708687 100644 --- a/BitLanguage.php +++ b/BitLanguage.php @@ -1,7 +1,7 @@ <?php /** * @package languages - * @version $Header: /cvsroot/bitweaver/_bit_languages/BitLanguage.php,v 1.7 2005/08/07 17:39:17 squareing Exp $ + * @version $Header: /cvsroot/bitweaver/_bit_languages/BitLanguage.php,v 1.8 2005/08/07 21:11:47 squareing Exp $ * * Copyright (c) 2005 bitweaver.org * Copyright (c) 2004-2005, Christian Fowler, et. al. @@ -370,10 +370,10 @@ class BitLanguage extends BitBase { 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->GetRow($query, array( BIT_MAJOR_VERSION, $pLangCode, $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 ) ) ); + $source = $this->mDb->getOne($query, array( $this->getSourceHash( $pString ) ) ); if( empty( $source ) ) { $this->storeMasterString( array( 'source_hash' => $this->getSourceHash( $pString ), 'new_source' => $pString ) ); } |