diff options
| author | Nils Adermann <naderman@naderman.de> | 2014-11-01 19:12:43 +0100 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2014-11-01 19:12:43 +0100 |
| commit | 2cc9fe5267adb9c9ab5d8bd2180d9bf625d81f4f (patch) | |
| tree | 1e20c9404050a7784aa98be143df0bfd5ed903ab | |
| parent | 3f3c8d74e8501e59e4e6ace3fa87ef3d29b78117 (diff) | |
| parent | c3aca59cfb58ffc40f8e85f57513c75530abbd18 (diff) | |
| download | forums-2cc9fe5267adb9c9ab5d8bd2180d9bf625d81f4f.tar forums-2cc9fe5267adb9c9ab5d8bd2180d9bf625d81f4f.tar.gz forums-2cc9fe5267adb9c9ab5d8bd2180d9bf625d81f4f.tar.bz2 forums-2cc9fe5267adb9c9ab5d8bd2180d9bf625d81f4f.tar.xz forums-2cc9fe5267adb9c9ab5d8bd2180d9bf625d81f4f.zip | |
Merge branch 'ticket/13268' into prep-release-3.1.1
* ticket/13268:
[ticket/13268] Properly append ternary result in get_existing_indexes()
| -rw-r--r-- | phpBB/phpbb/db/tools.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/phpbb/db/tools.php b/phpBB/phpbb/db/tools.php index 0781d7425e..c8d25f23a2 100644 --- a/phpBB/phpbb/db/tools.php +++ b/phpBB/phpbb/db/tools.php @@ -2643,7 +2643,7 @@ class tools AND cols.id = ix.id WHERE ix.id = object_id('{$table_name}') AND cols.name = '{$column_name}' - AND INDEXPROPERTY(ix.id, ix.name, 'IsUnique') = " . ($unique) ? '1' : '0'; + AND INDEXPROPERTY(ix.id, ix.name, 'IsUnique') = " . ($unique ? '1' : '0'); } else { @@ -2657,7 +2657,7 @@ class tools AND cols.object_id = ix.object_id WHERE ix.object_id = object_id('{$table_name}') AND cols.name = '{$column_name}' - AND ix.is_unique = " . ($unique) ? '1' : '0'; + AND ix.is_unique = " . ($unique ? '1' : '0'); } break; |