Skip to content
Snippets Groups Projects
Commit c91b3a34 authored by Peter Thienel's avatar Peter Thienel Committed by Jan-Hendrik Willms
Browse files

Resolve "Löschen eines Studienganges... I18N - Fehler"

Closes #555

Merge request studip/studip!269
parent 840e59f8
No related branches found
No related tags found
No related merge requests found
......@@ -19,6 +19,18 @@
class I18NStringDatafield extends I18NString
{
/**
* Sets the metadata (database info object_id) of this i18n datafield.
*
* @param array $metadata Database info for object_id.
*/
public function setMetadata($metadata)
{
if (is_null($metadata['table'])) {
$this->metadata = $metadata;
}
}
/**
* Return an array containg the text in all additional languages.
*
......@@ -47,7 +59,8 @@ class I18NStringDatafield extends I18NString
. "WHERE `datafield_id` = ? "
. "AND `range_id` = ? "
. "AND `sec_range_id` = ? "
. "AND `lang` <> ?", $object_id);
. "AND `lang` <> ''",
[$object_id[0], $object_id[1], $object_id[2]]);
$i18nSQL = $db->prepare("INSERT INTO `datafields_entries` "
. "(`datafield_id`, `range_id`, `sec_range_id`, `content`, `lang`) "
. "VALUES (?,?,?,?,?)");
......@@ -81,7 +94,6 @@ class I18NStringDatafield extends I18NString
. "AND `sec_range_id` = ? "
. "AND `lang` = ''", $object_id);
}
// var_dump($object_id, $base); exit;
$table = null;
$field = null;
return new self($base, self::fetchDataForField($object_id, $table, $field),
......
......@@ -810,7 +810,7 @@ abstract class ModuleManagementModel extends SimpleORMap
* @return string The currently selected language.
*/
public static final function getLanguage()
{ return 'DE';
{
$language = self::$language ?: $GLOBALS['MVV_LANGUAGES']['default'];
return $language;
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment