updated core and modules

2017-09-09 16:27:51 +02:00
parent 027aa99b32
commit 41863f872c
7810 changed files with 318922 additions and 83631 deletions
@@ -716,8 +716,8 @@ final class Iconv

    private static function getData($file)
    {
-        if (file_exists($file = __DIR__.'/Resources/charset/'.$file.'.ser')) {
-            return unserialize(file_get_contents($file));
+        if (file_exists($file = __DIR__.'/Resources/charset/'.$file.'.php')) {
+            return require $file;
        }

        return false;
@@ -28,7 +28,7 @@
    "minimum-stability": "dev",
    "extra": {
        "branch-alias": {
-            "dev-master": "1.1-dev"
+            "dev-master": "1.3-dev"
        }
    }
 }