Merge remote-tracking branch 'origin/dev' into dev

Author: weblate

README.md

@@ -68,7 +68,7 @@ Wavelog-support can be reached by creating an issue here at github. If you've an
 
 Special thanks to our contributors, who are part of Wavelog by improving code!
 
-[F4ANS](https://github.com/abarrau), [DG0TM](https://github.com/dg0tm), [DG9VH](https://github.com/dg9vh), [DJ3CE](https://github.com/dj3ce), [R1BLH](https://github.com/r1blh), [BG2ELG](https://github.com/violarulan), [DF1ASH](https://github.com/derFogel), [DB4SCW](https://github.com/DB4SCW), [VE2HEW](https://github.com/anthonydiiorio), [OK1GOD](https://github.com/filipmelik), [DJ1PW](https://github.com/winnieXY), [toseppo](https://github.com/toseppo), [N7DSB](https://github.com/desertblade), [BA7LAC](https://github.com/imlonghao), [AE4CE](https://github.com/ethancedwards8), [K1AF](https://github.com/patrickrb), [OE4BAM](https://github.com/MatykoBr), [HB9HJQ](https://github.com/zone11), [R3DHX](https://github.com/AleksdemSA), [uiolee](https://github.com/uiolee), [VK3ARR](https://github.com/VK3ARR), [BI7BST](https://github.com/Cryolitia), [ludoux](https://github.com/ludoux), [BG5ATV](https://github.com/tallcode), [BH6SKD](https://github.com/xiaosuan2b), [VK7TO](https://github.com/RhinoLance), [IU2FRL](https://github.com/iu2frl), [szporwolik](https://github.com/szporwolik), [agrif](https://github.com/agrif), [goodspeed34](https://github.com/goodspeed34)
+[F4ANS](https://github.com/abarrau), [DG0TM](https://github.com/dg0tm), [DG9VH](https://github.com/dg9vh), [DJ3CE](https://github.com/dj3ce), [R1BLH](https://github.com/r1blh), [BG2ELG](https://github.com/violarulan), [DF1ASH](https://github.com/derFogel), [DB4SCW](https://github.com/DB4SCW), [VE2HEW](https://github.com/anthonydiiorio), [OK1GOD](https://github.com/filipmelik), [DJ1PW](https://github.com/winnieXY), [toseppo](https://github.com/toseppo), [N7DSB](https://github.com/desertblade), [BA7LAC](https://github.com/imlonghao), [AE4CE](https://github.com/ethancedwards8), [K1AF](https://github.com/patrickrb), [OE4BAM](https://github.com/MatykoBr), [HB9HJQ](https://github.com/zone11), [R3DHX](https://github.com/AleksdemSA), [uiolee](https://github.com/uiolee), [VK3ARR](https://github.com/VK3ARR), [BI7BST](https://github.com/Cryolitia), [ludoux](https://github.com/ludoux), [BG5ATV](https://github.com/tallcode), [BH6SKD](https://github.com/xiaosuan2b), [VK7TO](https://github.com/RhinoLance), [IU2FRL](https://github.com/iu2frl), [szporwolik](https://github.com/szporwolik), [agrif](https://github.com/agrif), [goodspeed34](https://github.com/goodspeed34), [kmanwar89](https://github.com/kmanwar89)
 
 Translators:
 

application/config/migration.php

@@ -22,7 +22,7 @@
 |
 */
 
-$config['migration_version'] = 267;
+$config['migration_version'] = 268;
 
 /*
 |--------------------------------------------------------------------------

application/migrations/268_tag_2_2_1.php

@@ -0,0 +1,33 @@
+<?php
+
+defined('BASEPATH') OR exit('No direct script access allowed');
+
+/*
+        Tag Wavelog as Version 2.2.1
+*/
+
+class Migration_tag_2_2_1 extends CI_Migration {
+
+    public function up()
+    {
+        // Tag Wavelog New Version
+        $this->db->where('option_name', 'version');
+        $this->db->update('options', array('option_value' => '2.2.1'));
+
+        // Trigger Version Info Dialog
+        $this->db->where('option_type', 'version_dialog');
+        $this->db->where('option_name', 'confirmed');
+        $this->db->update('user_options', array('option_value' => 'false'));
+
+        // Also set Version Dialog to "both" if only custom text is applied
+        $this->db->where('option_name', 'version_dialog');
+        $this->db->where('option_value', 'custom_text');
+        $this->db->update('options', array('option_value' => 'both'));
+    }
+
+    public function down()
+    {
+        $this->db->where('option_name', 'version');
+        $this->db->update('options', array('option_value' => '2.2'));
+    }
+}