aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBibiko <bibiko@eva.mpg.de>2010-01-13 19:21:17 +0000
committerBibiko <bibiko@eva.mpg.de>2010-01-13 19:21:17 +0000
commitaeb5ec548006a76e926a2bd982b362e13251841b (patch)
tree4eb23d1bccbec0ffb2793f61e6492426bba4524b
parentb9bd8cfbf90f905b7f5b6d0fc442548411d17168 (diff)
downloadsequelpro-aeb5ec548006a76e926a2bd982b362e13251841b.tar.gz
sequelpro-aeb5ec548006a76e926a2bd982b362e13251841b.tar.bz2
sequelpro-aeb5ec548006a76e926a2bd982b362e13251841b.zip
• avoid querying for collations if passed var "encoding" for method getDatabaseCollationsForEncoding is equal to NULL
-rw-r--r--Source/SPDatabaseData.m2
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/SPDatabaseData.m b/Source/SPDatabaseData.m
index b27863b9..c3649328 100644
--- a/Source/SPDatabaseData.m
+++ b/Source/SPDatabaseData.m
@@ -259,7 +259,7 @@ const CHAR_SETS charsets[] =
*/
- (NSArray *)getDatabaseCollationsForEncoding:(NSString *)encoding
{
- if ((characterSetEncoding == nil) || (![characterSetEncoding isEqualToString:encoding]) || ([characterSetCollations count] == 0)) {
+ if (encoding && ((characterSetEncoding == nil) || (![characterSetEncoding isEqualToString:encoding]) || ([characterSetCollations count] == 0))) {
[characterSetEncoding release];
[characterSetCollations removeAllObjects];