Revision dcaf9754
Von Moritz Bunkus vor mehr als 12 Jahren hinzugefügt
SL/DBUpgrade2.pm | ||
---|---|---|
74 | 74 |
|
75 | 75 |
next if ($control->{ignore}); |
76 | 76 |
|
77 |
$control->{charset} ||= Common::DEFAULT_CHARSET;
|
|
77 |
$control->{charset} = $control->{charset} || $control->{encoding} || Common::DEFAULT_CHARSET;
|
|
78 | 78 |
|
79 | 79 |
if (!$control->{"tag"}) { |
80 | 80 |
_control_error($form, $file_name, $locale->text("Missing 'tag' field.")) ; |
... | ... | |
136 | 136 |
my $file_charset = Common::DEFAULT_CHARSET; |
137 | 137 |
while (<$fh>) { |
138 | 138 |
last if !/^--/; |
139 |
next if !/^--\s*\@charset:\s*(.+)/;
|
|
139 |
next if !/^--\s*\@(?:charset|encoding):\s*(.+)/;
|
|
140 | 140 |
$file_charset = $1; |
141 | 141 |
last; |
142 | 142 |
} |
... | ... | |
233 | 233 |
} else { |
234 | 234 |
while (<$fh>) { |
235 | 235 |
last if !/^--/; |
236 |
next if !/^--\s*\@charset:\s*(.+)/;
|
|
236 |
next if !/^--\s*\@(?:charset|encoding):\s*(.+)/;
|
|
237 | 237 |
$file_charset = $1; |
238 | 238 |
last; |
239 | 239 |
} |
... | ... | |
547 | 547 |
before the current one is applied. |
548 | 548 |
|
549 | 549 |
=item charset |
550 |
=item encoding |
|
550 | 551 |
|
551 |
The charset this file uses. Defaults to C<ISO-8859-15> if missing. |
|
552 |
The charset this file uses. Defaults to C<ISO-8859-15> if |
|
553 |
missing. Both terms are recognized. |
|
552 | 554 |
|
553 | 555 |
=item priority |
554 | 556 |
|
Auch abrufbar als: Unified diff
SQL-Upgrade: '@encoding' als Alias für '@charset' erkennen