Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x
This commit is contained in:
commit
31ef7c2e7c
|
@ -1,3 +1,16 @@
|
||||||
|
DELETE FROM cc_pref WHERE id IN (
|
||||||
|
SELECT cc_pref.id
|
||||||
|
FROM cc_pref
|
||||||
|
LEFT OUTER JOIN (
|
||||||
|
SELECT MAX(id) as id, keystr, subjid
|
||||||
|
FROM cc_pref
|
||||||
|
GROUP BY keystr, subjid
|
||||||
|
) as KeepRows ON
|
||||||
|
cc_pref.id = KeepRows.id
|
||||||
|
WHERE
|
||||||
|
KeepRows.id IS NULL
|
||||||
|
);
|
||||||
|
|
||||||
DELETE FROM cc_pref WHERE keystr = 'system_version';
|
DELETE FROM cc_pref WHERE keystr = 'system_version';
|
||||||
INSERT INTO cc_pref (keystr, valstr) VALUES ('system_version', '2.4.0');
|
INSERT INTO cc_pref (keystr, valstr) VALUES ('system_version', '2.4.0');
|
||||||
|
|
||||||
|
@ -16,4 +29,4 @@ UPDATE cc_files
|
||||||
SET is_playlist = true
|
SET is_playlist = true
|
||||||
WHERE id IN (SELECT DISTINCT(file_id) FROM cc_blockcontents);
|
WHERE id IN (SELECT DISTINCT(file_id) FROM cc_blockcontents);
|
||||||
|
|
||||||
INSERT INTO cc_locale (locale_code, locale_lang) VALUES ('hu_HU', 'Magyar');
|
INSERT INTO cc_locale (locale_code, locale_lang) VALUES ('hu_HU', 'Magyar');
|
Loading…
Reference in New Issue