Index: branches/5.2.x/core/units/helpers/multilanguage_helper.php =================================================================== diff -u -N -r14572 -r14628 --- branches/5.2.x/core/units/helpers/multilanguage_helper.php (.../multilanguage_helper.php) (revision 14572) +++ branches/5.2.x/core/units/helpers/multilanguage_helper.php (.../multilanguage_helper.php) (revision 14628) @@ -1,6 +1,6 @@ Application->UnitConfigReader->loadConfig($regs[1]); $this->Application->UnitConfigReader->runAfterConfigRead($prefix); @@ -171,52 +172,55 @@ $table_name = $this->Application->getUnitOption($prefix, 'TableName'); $this->curFields = $this->Application->getUnitOption($prefix, 'Fields'); - if (!($table_name && $this->curFields) || ($table_name && !$this->Conn->TableFound($table_name))) { + if ( !($table_name && $this->curFields) || ($table_name && !$this->Conn->TableFound($table_name)) ) { // invalid config found or prefix not found - return true; + return ; } $this->initLanguageCount(); - $sqls = Array(); + $sqls = Array (); $this->readTableStructure($table_name, $refresh); - foreach($this->curFields as $field_name => $field_options) - { - if (getArrayValue($field_options, 'formatter') == 'kMultiLanguage') { - if (isset($field_options['master_field'])) { + foreach ($this->curFields as $field_name => $field_options) { + if ( getArrayValue($field_options, 'formatter') == 'kMultiLanguage' ) { + if ( isset($field_options['master_field']) ) { unset($this->curFields[$field_name]); continue; } $this->setSourceField($field_name); - if ($this->languageCount > 0) { + if ( $this->languageCount > 0 ) { // `l77_Name` VARCHAR( 255 ) NULL DEFAULT '0'; - $field_mask = Array(); - $field_mask['name'] = 'l%s_'.$field_name; + $field_mask = Array (); + $field_mask['name'] = 'l%s_' . $field_name; $field_mask['null'] = getArrayValue($field_options, 'not_null') ? 'NOT NULL' : 'NULL'; - if ($this->curSourceField) { - $default_value = $this->getFieldParam('Default') != 'NULL' ? $this->Conn->qstr($this->getFieldParam('Default')) : $this->getFieldParam('Default'); + if ( $this->curSourceField ) { + $default_value = $this->getFieldParam('Default') != 'NULL' + ? $this->Conn->qstr($this->getFieldParam('Default')) + : $this->getFieldParam('Default'); $field_mask['type'] = $this->getFieldParam('Type'); } else { - $default_value = is_null($field_options['default']) ? 'NULL' : $this->Conn->qstr($field_options['default']); + $default_value = is_null($field_options['default']) ? 'NULL' + : $this->Conn->qstr($field_options['default']); $field_mask['type'] = $field_options['db_type']; } - $field_mask['default'] = ($field_mask['null'] == 'NOT NULL' && $default_value == 'NULL') ? '' : 'DEFAULT '.$default_value; + $field_mask['default'] = ($field_mask['null'] == 'NOT NULL' && $default_value == 'NULL') ? '' + : 'DEFAULT ' . $default_value; - if (strtoupper($field_mask['type']) == 'TEXT') { + if ( strtoupper($field_mask['type']) == 'TEXT' ) { // text fields in mysql doesn't have default value - $field_mask = $field_mask['name'].' '.$field_mask['type'].' '.$field_mask['null']; + $field_mask = $field_mask['name'] . ' ' . $field_mask['type'] . ' ' . $field_mask['null']; } else { - $field_mask = $field_mask['name'].' '.$field_mask['type'].' '.$field_mask['null'].' '.$field_mask['default']; + $field_mask = $field_mask['name'] . ' ' . $field_mask['type'] . ' ' . $field_mask['null'] . ' ' . $field_mask['default']; } $alter_sqls = $this->generateAlterSQL($field_mask, 1, $this->languageCount); - if ($alter_sqls) { - $sqls[] = 'ALTER TABLE '.$table_name.' '.$alter_sqls; + if ( $alter_sqls ) { + $sqls[] = 'ALTER TABLE ' . $table_name . ' ' . $alter_sqls; } } } @@ -233,15 +237,17 @@ * @param string $prefix * @param int $src_language * @param int $dst_language + * @return void + * @access public */ - function copyMissingData($prefix, $src_language, $dst_language) + public function copyMissingData($prefix, $src_language, $dst_language) { $table_name = $this->Application->getUnitOption($prefix, 'TableName'); $this->curFields = $this->Application->getUnitOption($prefix, 'Fields'); - if (!($table_name && $this->curFields) || ($table_name && !$this->Conn->TableFound($table_name))) { + if ( !($table_name && $this->curFields) || ($table_name && !$this->Conn->TableFound($table_name)) ) { // invalid config found or prefix not found - return true; + return ; } foreach ($this->curFields as $field_name => $field_options) {