From c891277996872920f88ea7bb36b1e57e3674579f Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 23 Oct 2016 22:00:02 +0200 Subject: [ticket/14831] Add migration for deduplicating entries and fix typo PHPBB3-14831 --- phpBB/phpbb/db/migrator.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'phpBB/phpbb/db/migrator.php') diff --git a/phpBB/phpbb/db/migrator.php b/phpBB/phpbb/db/migrator.php index d84635f33d..30eafcc470 100644 --- a/phpBB/phpbb/db/migrator.php +++ b/phpBB/phpbb/db/migrator.php @@ -212,12 +212,12 @@ class migrator // Try falling back to a valid migration name with or without leading backslash if (!isset($this->migration_state[$name])) { - $appended_name = preg_replace('#^(?!\\\)#', '\\\$0', $name); + $prepended_name = preg_replace('#^(?!\\\)#', '\\\$0', $name); $prefixless_name = preg_replace('#(^\\\)([^\\\].+)#', '$2', $name); - if (isset($this->migration_state[$appended_name])) + if (isset($this->migration_state[$prepended_name])) { - $name = $appended_name; + $name = $prepended_name; } else if (isset($this->migration_state[$prefixless_name])) { -- cgit v1.2.1