aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2015-01-10 16:25:44 +0100
committerMarc Alexander <admin@m-a-styles.de>2015-01-10 16:25:44 +0100
commitb4a2beff24f2a269b3f92f62b7d63b8b49e142f6 (patch)
tree650c64e04ebec417257a8b7cbce9f5b82615f327
parent45ccd2d44afe78838f5e782c0c559e2d082536d8 (diff)
parenta415a4ec2b732d4bb88ab4da8f4709fe748592f6 (diff)
downloadforums-b4a2beff24f2a269b3f92f62b7d63b8b49e142f6.tar
forums-b4a2beff24f2a269b3f92f62b7d63b8b49e142f6.tar.gz
forums-b4a2beff24f2a269b3f92f62b7d63b8b49e142f6.tar.bz2
forums-b4a2beff24f2a269b3f92f62b7d63b8b49e142f6.tar.xz
forums-b4a2beff24f2a269b3f92f62b7d63b8b49e142f6.zip
Merge branch 'develop-ascraeus' into develop
-rw-r--r--phpBB/phpbb/db/migration/data/v31x/profilefield_remove_underscore_from_alpha.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/phpbb/db/migration/data/v31x/profilefield_remove_underscore_from_alpha.php b/phpBB/phpbb/db/migration/data/v31x/profilefield_remove_underscore_from_alpha.php
index 1f25d239a6..60491f8de8 100644
--- a/phpBB/phpbb/db/migration/data/v31x/profilefield_remove_underscore_from_alpha.php
+++ b/phpBB/phpbb/db/migration/data/v31x/profilefield_remove_underscore_from_alpha.php
@@ -40,8 +40,8 @@ class profilefield_remove_underscore_from_alpha extends \phpbb\db\migration\migr
public function update_validation_rule($old_validation, $new_validation)
{
$sql = 'UPDATE ' . PROFILE_FIELDS_TABLE . "
- SET field_validation = '" . $this->db->sql_escpape($new_validation) . "'
- WHERE field_validation = '" . $this->db->sql_escpape($old_validation) . "'";
+ SET field_validation = '" . $this->db->sql_escape($new_validation) . "'
+ WHERE field_validation = '" . $this->db->sql_escape($old_validation) . "'";
$this->db->sql_query($sql);
}
}