diff options
| author | martin-rueegg <martin.rueegg@metaworx.ch> | 2015-03-03 03:49:15 +0300 |
|---|---|---|
| committer | Vincent Petry <pvince81@owncloud.com> | 2015-05-18 18:01:06 +0300 |
| commit | 524045cdbdbbf37e173b81a7556176749ace0de2 (patch) | |
| tree | 9b79955b1a1572068369da1d755567d3d490d862 /lib | |
| parent | 4e44d2ecd6cc2ac065342591c1af61532b3ba774 (diff) | |
replace 'oc_' with dbtableprefix form config for temporary table names and indexes
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/private/db/migrator.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/private/db/migrator.php b/lib/private/db/migrator.php index fcf5aae0258..f55b5078c0e 100644 --- a/lib/private/db/migrator.php +++ b/lib/private/db/migrator.php @@ -100,7 +100,7 @@ class Migrator { * @return string */ protected function generateTemporaryTableName($name) { - return 'oc_' . $name . '_' . $this->random->generate(13, ISecureRandom::CHAR_LOWER . ISecureRandom::CHAR_DIGITS); + return $this->config->getSystemValue('dbtableprefix', 'oc_') . $name . '_' . $this->random->generate(13, ISecureRandom::CHAR_LOWER . ISecureRandom::CHAR_DIGITS); } /** @@ -151,7 +151,7 @@ class Migrator { $indexName = $index->getName(); } else { // avoid conflicts in index names - $indexName = 'oc_' . $this->random->generate(13, ISecureRandom::CHAR_LOWER . ISecureRandom::CHAR_DIGITS); + $indexName = $this->config->getSystemValue('dbtableprefix', 'oc_') . $this->random->generate(13, ISecureRandom::CHAR_LOWER . ISecureRandom::CHAR_DIGITS); } $newIndexes[] = new Index($indexName, $index->getColumns(), $index->isUnique(), $index->isPrimary()); } |