Commit d52fc9b4 authored by webchick's avatar webchick
Browse files

Revert "git commit -m Issue"

I fail at committing from airports. :P

This reverts commit 26e0acb8.
parent 26e0acb8
...@@ -3997,7 +3997,7 @@ function _system_date_formats_build() { ...@@ -3997,7 +3997,7 @@ function _system_date_formats_build() {
} }
// Get custom formats added to the database by the end user. // Get custom formats added to the database by the end user.
$result = db_query('SELECT df.dfid, df.format, df.type, df.locked, dfl.language FROM {date_formats} df LEFT JOIN {date_format_locale} dfl ON df.format = dfl.format AND df.type = dfl.type ORDER BY df.type, df.format'); $result = db_query('SELECT df.dfid, df.format, df.type, df.locked, dfl.language FROM {date_formats} df LEFT JOIN {date_format_type} dft ON df.type = dft.type LEFT JOIN {date_format_locale} dfl ON df.format = dfl.format AND df.type = dfl.type ORDER BY df.type, df.format');
foreach ($result as $record) { foreach ($result as $record) {
// If this date type isn't set, initialise the array. // If this date type isn't set, initialise the array.
if (!isset($date_formats[$record->type])) { if (!isset($date_formats[$record->type])) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment