From ab0010f543d88fa19506907684a9d329d4dd94e3 Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Thu, 25 May 2017 12:14:41 +0300 Subject: [ci skip] Fix #5131 --- system/core/CodeIgniter.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'system/core/CodeIgniter.php') diff --git a/system/core/CodeIgniter.php b/system/core/CodeIgniter.php index b5c2bedf4..0fab092e5 100644 --- a/system/core/CodeIgniter.php +++ b/system/core/CodeIgniter.php @@ -434,7 +434,7 @@ if ( ! is_php('5.4')) * ReflectionMethod::isConstructor() is the ONLY reliable check, * knowing which method will be executed as a constructor. */ - elseif ( ! is_callable(array($class, $method)) && strcasecmp($class, $method) === 0) + elseif ( ! is_callable(array($class, $method))) { $reflection = new ReflectionMethod($class, $method); if ( ! $reflection->isPublic() OR $reflection->isConstructor()) -- cgit v1.2.3-24-g4f1b From 5b0e1f222cc96ed55d524008e1edcf9058e5132d Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Mon, 19 Jun 2017 11:29:39 +0300 Subject: [ci skip] Prepare 3.1.5 release --- system/core/CodeIgniter.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'system/core/CodeIgniter.php') diff --git a/system/core/CodeIgniter.php b/system/core/CodeIgniter.php index 0fab092e5..823e034d7 100644 --- a/system/core/CodeIgniter.php +++ b/system/core/CodeIgniter.php @@ -55,7 +55,7 @@ defined('BASEPATH') OR exit('No direct script access allowed'); * @var string * */ - const CI_VERSION = '3.1.5-dev'; + const CI_VERSION = '3.1.5'; /* * ------------------------------------------------------ -- cgit v1.2.3-24-g4f1b From 47f540e82cbc1591cc7f1aa92d47a8c8c4028c63 Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Mon, 19 Jun 2017 11:38:25 +0300 Subject: [ci skip] Starting 3.1.6-dev --- system/core/CodeIgniter.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'system/core/CodeIgniter.php') diff --git a/system/core/CodeIgniter.php b/system/core/CodeIgniter.php index 823e034d7..f5ffc5ddd 100644 --- a/system/core/CodeIgniter.php +++ b/system/core/CodeIgniter.php @@ -55,7 +55,7 @@ defined('BASEPATH') OR exit('No direct script access allowed'); * @var string * */ - const CI_VERSION = '3.1.5'; + const CI_VERSION = '3.1.6-dev'; /* * ------------------------------------------------------ -- cgit v1.2.3-24-g4f1b