Show Tibet as part of China on map (#11930)

* Revert "free tibet!"

This reverts commit 4e47c8aba3bf146292f6e9d38aa0151c383e6c33.

* Remove unneeded translations

* adjust API

* fix tests

* update screenshots

* update tests files

* update screenshot

* Do not change detected location

* update tests

* Fix continent detection for old records

* submodule update

* update screenshots

* Cleanup

* use group by filters only if needed

* make filter work for datatable maps

1 files changed, 4 insertions, 0 deletions

diff --git a/core/Common.php b/core/Common.php
index 1616e56505..f884d9fe2f 100644
--- a/core/Common.php
+++ b/core/Common.php
@@ -1026,6 +1026,10 @@ class Common
 
         $countryList = $dataProvider->getCountryList();
 
+        if ($country == 'ti') {
+            $country = 'cn';
+        }
+
         return isset($countryList[$country]) ? $countryList[$country] : 'unk';
     }