Upgrade to 2.5.14

Author: bastianallgeier

kirby/composer.json

@@ -27,7 +27,7 @@
     "erusev/parsedown": "1.7.1",
     "erusev/parsedown-extra": "0.7.1",
     "michelf/php-smartypants": "1.8.1",
-    "getkirby/toolkit": "2.5.13",
+    "getkirby/toolkit": "2.5.14",
     "filp/whoops": "2.1.14"
   },
   "archive": {

kirby/composer.lock

@@ -10,7 +10,7 @@
 
 class Kirby {
 
-  static public $version = '2.5.13';
+  static public $version = '2.5.14';
   static public $instance;
   static public $hooks = array();
   static public $triggered = array();

kirby/kirby.php

@@ -1,11 +1,13 @@
-# Kirby Core
+# Kirby v2 Core
 
-This is the Kirby Core submodule.
+Please refer to the [Kirby Starterkit](http://github.com/getkirby-v2/starterkit)
+for a complete installation of Kirby 2.
 
-Please refer to the [Kirby Starterkit](http://github.com/getkirby/starterkit)
-for a complete installation of Kirby
+## Kirby 2 - EOL
 
-![Build Status](https://travis-ci.org/getkirby/kirby.svg?branch=master)
+Kirby 2 is an old version of Kirby CMS. We are supporting it with security updates until December 31st, 2020. 
+
+For the latest version of Kirby, check out https://getkirby.com
 
 ## Author
 Bastian Allgeier

kirby/readme.md

@@ -37,8 +37,8 @@
  *
  * @author Fabien Potencier <[email protected]>
  * @author Jordi Boggiano <[email protected]>
- * @see    http://www.php-fig.org/psr/psr-0/
- * @see    http://www.php-fig.org/psr/psr-4/
+ * @see    https://www.php-fig.org/psr/psr-0/
+ * @see    https://www.php-fig.org/psr/psr-4/
  */
 class ClassLoader
 {
@@ -60,7 +60,7 @@ class ClassLoader
     public function getPrefixes()
     {
         if (!empty($this->prefixesPsr0)) {
-            return call_user_func_array('array_merge', $this->prefixesPsr0);
+            return call_user_func_array('array_merge', array_values($this->prefixesPsr0));
         }
 
         return array();