From 6a626963524f052937cd0e6b1d5c9d6405093fbf Mon Sep 17 00:00:00 2001 From: helge Date: Wed, 14 Sep 2005 12:28:08 +0000 Subject: [PATCH] fixed a minor issue git-svn-id: http://svn.opengroupware.org/SOPE/trunk@1105 e4a50df8-12e2-0310-a44c-efbce7f8a7e3 --- sope-appserver/WEExtensions/ChangeLog | 5 +++++ sope-appserver/WEExtensions/Version | 2 +- sope-appserver/WEExtensions/WETableMatrixLabel.m | 7 +++++-- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/sope-appserver/WEExtensions/ChangeLog b/sope-appserver/WEExtensions/ChangeLog index 70af60d2..21b9674c 100644 --- a/sope-appserver/WEExtensions/ChangeLog +++ b/sope-appserver/WEExtensions/ChangeLog @@ -1,3 +1,8 @@ +2005-09-09 Helge Hess + + * WETableMatrixLabel.m: avoid an edge condition when the position + binding is missing (v4.5.82) + 2005-08-27 Helge Hess * WETableView: added common.h file to support PCH (not required for diff --git a/sope-appserver/WEExtensions/Version b/sope-appserver/WEExtensions/Version index b5e19865..392a00ce 100644 --- a/sope-appserver/WEExtensions/Version +++ b/sope-appserver/WEExtensions/Version @@ -1,6 +1,6 @@ # version file -SUBMINOR_VERSION:=81 +SUBMINOR_VERSION:=82 # v4.5.76 requires libNGObjWeb v4.5.176 # v4.5.75 requires libNGObjWeb v4.5.174 diff --git a/sope-appserver/WEExtensions/WETableMatrixLabel.m b/sope-appserver/WEExtensions/WETableMatrixLabel.m index 29067bca..3e4f3052 100644 --- a/sope-appserver/WEExtensions/WETableMatrixLabel.m +++ b/sope-appserver/WEExtensions/WETableMatrixLabel.m @@ -101,8 +101,11 @@ static NSString *retStrForInt(int i) { pos = [self->position stringValueInComponent:[_ctx component]]; - if ((tmp = [_ctx valueForKey:@"WETableMatrix_Query"])) { - [tmp addObject:pos]; + if ((tmp = [_ctx valueForKey:@"WETableMatrix_Query"]) != nil) { + if (pos == nil) + [self errorWithFormat:@"got no position: %@", self->position]; + else + [tmp addObject:pos]; return; } -- 2.39.5