mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-29 13:00:26 +02:00
Code Issues Releases Wiki Activity

Merge branch 'ticket/13268' into prep-release-3.1.1

Browse Source 
* ticket/13268:
  [ticket/13268] Properly append ternary result in get_existing_indexes()
This commit is contained in:
Nils Adermann
2014-11-01 19:12:43 +01:00
parent 3f3c8d74e8 c3aca59cfb
commit 2cc9fe5267
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
phpBB/phpbb/db/tools.php
View File

@@ -2643,7 +2643,7 @@ class tools
AND cols.id = ix.id AND cols.id = ix.id
WHERE ix.id = object_id('{$table_name}') WHERE ix.id = object_id('{$table_name}')
AND cols.name = '{$column_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 else
{ {
@@ -2657,7 +2657,7 @@ class tools
AND cols.object_id = ix.object_id AND cols.object_id = ix.object_id
WHERE ix.object_id = object_id('{$table_name}') WHERE ix.object_id = object_id('{$table_name}')
AND cols.name = '{$column_name}' AND cols.name = '{$column_name}'
AND ix.is_unique = " . ($unique) ? '1' : '0'; AND ix.is_unique = " . ($unique ? '1' : '0');
} }
break; break;