diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2016-10-23 22:00:02 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2016-10-23 22:00:02 +0200 |
| commit | c891277996872920f88ea7bb36b1e57e3674579f (patch) | |
| tree | a80c549208e466109bf635e72cc0d4f8a1b35210 /phpBB/phpbb/db/migrator.php | |
| parent | 9f2867b115ad6e07cf7be6b2ca98ed6ef5be07c7 (diff) | |
| download | forums-c891277996872920f88ea7bb36b1e57e3674579f.tar forums-c891277996872920f88ea7bb36b1e57e3674579f.tar.gz forums-c891277996872920f88ea7bb36b1e57e3674579f.tar.bz2 forums-c891277996872920f88ea7bb36b1e57e3674579f.tar.xz forums-c891277996872920f88ea7bb36b1e57e3674579f.zip | |
[ticket/14831] Add migration for deduplicating entries and fix typo
PHPBB3-14831
Diffstat (limited to 'phpBB/phpbb/db/migrator.php')
| -rw-r--r-- | phpBB/phpbb/db/migrator.php | 6 |
1 files changed, 3 insertions, 3 deletions
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])) { |