diff options
| author | rowanbeentje <rowan@beent.je> | 2010-01-20 23:51:15 +0000 |
|---|---|---|
| committer | rowanbeentje <rowan@beent.je> | 2010-01-20 23:51:15 +0000 |
| commit | a485d370c24cb6378a52c3452dc0cdbadfefd50f (patch) | |
| tree | f3bb2ded2b5571d860d7677cca509d575ec5ef81 /Source/SPProcessListController.m | |
| parent | 38ed0a7356c24b2113e157fbec26004100b5f1e9 (diff) | |
| download | sequelpro-a485d370c24cb6378a52c3452dc0cdbadfefd50f.tar.gz sequelpro-a485d370c24cb6378a52c3452dc0cdbadfefd50f.tar.bz2 sequelpro-a485d370c24cb6378a52c3452dc0cdbadfefd50f.zip | |
Address Issue #546 (format string bugs):
- Fix incorrect uses of [NSString stringWithFormat:] with preconstructed strings and no arguments in SPUserManager
- To fix display issues, replace NSBeginAlertSheet (which includes automatic sprintf expansion of the message) with a safely-escaped SPBeginAlertSheet in many files
Diffstat (limited to 'Source/SPProcessListController.m')
| -rw-r--r-- | Source/SPProcessListController.m | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Source/SPProcessListController.m b/Source/SPProcessListController.m index 98137fb4..51f644d6 100644 --- a/Source/SPProcessListController.m +++ b/Source/SPProcessListController.m @@ -29,6 +29,7 @@ #import "SPArrayAdditions.h" #import "TableDocument.h" #import "SPConstants.h" +#import "SPAlertSheets.h" @interface SPProcessListController (PrivateAPI) @@ -447,7 +448,7 @@ // Check for errors if (![[connection getLastErrorMessage] isEqualToString:@""]) { - NSBeginAlertSheet(NSLocalizedString(@"Unable to kill query", @"error killing query message"), NSLocalizedString(@"OK", @"OK button"), nil, nil, [self window], self, nil, nil, nil, + SPBeginAlertSheet(NSLocalizedString(@"Unable to kill query", @"error killing query message"), NSLocalizedString(@"OK", @"OK button"), nil, nil, [self window], self, nil, nil, nil, [NSString stringWithFormat:NSLocalizedString(@"An error occured while attempting to kill the query associated with connection %lu.\n\nMySQL said: %@", @"error killing query informative message"), (unsigned long)processId, [connection getLastErrorMessage]]); } @@ -465,7 +466,7 @@ // Check for errors if (![[connection getLastErrorMessage] isEqualToString:@""]) { - NSBeginAlertSheet(NSLocalizedString(@"Unable to kill connection", @"error killing connection message"), NSLocalizedString(@"OK", @"OK button"), nil, nil, [self window], self, nil, nil, nil, + SPBeginAlertSheet(NSLocalizedString(@"Unable to kill connection", @"error killing connection message"), NSLocalizedString(@"OK", @"OK button"), nil, nil, [self window], self, nil, nil, nil, [NSString stringWithFormat:NSLocalizedString(@"An error occured while attempting to kill connection %lu.\n\nMySQL said: %@", @"error killing query informative message"), (unsigned long)processId, [connection getLastErrorMessage]]); } |