I enclose some simple diffs for wonder 7 - snapshot.
The first is a simple typo but its presence is irritating my sensibilities in
my log files.
diff --git
a/Frameworks/Core/ERExtensions/Sources/er/extensions/appserver/navigation/ERXNavigationItem.java
b/Frameworks/Core/ERExtensions/Sources/er/extensions/appserver/navigation/ERXNavigationItem.java
index 055add3..6518077 100644
---
a/Frameworks/Core/ERExtensions/Sources/er/extensions/appserver/navigation/ERXNavigationItem.java
+++
b/Frameworks/Core/ERExtensions/Sources/er/extensions/appserver/navigation/ERXNavigationItem.java
@@ -225,7 +225,7 @@
}
}
else {
- log.warn("For nav core object: {} and
child binding: {} recieved binding object: {}", this, childrenBinding(), o);
+ log.warn("For nav core object: {} and
child binding: {} received binding object: {}", this, childrenBinding(), o);
}
}
}
The other is a simple fix to navigation menu item, (ERExtensions) which ensures
a generated URL stays secure if the current request is secure.
diff --git
a/Frameworks/Core/ERExtensions/Sources/er/extensions/appserver/navigation/ERXNavigationMenuItem.java
b/Frameworks/Core/ERExtensions/Sources/er/extensions/appserver/navigation/ERXNavigationMenuItem.java
index 9165d30..03acd48 100644
---
a/Frameworks/Core/ERExtensions/Sources/er/extensions/appserver/navigation/ERXNavigationMenuItem.java
+++
b/Frameworks/Core/ERExtensions/Sources/er/extensions/appserver/navigation/ERXNavigationMenuItem.java
@@ -117,7 +117,7 @@
if(_linkDirectlyToDirectActions) {
NSMutableDictionary bindings =
navigationItem().queryBindings().mutableClone();
bindings.setObjectForKey(context().contextID(),
"__cid");
- url =
context().directActionURLForActionNamed(navigationItem().directActionName(),
bindings);
+ url =
context().directActionURLForActionNamed(navigationItem().directActionName(),
bindings, ERXRequest.isRequestSecure(context().request()), false);
} else {
url = context().componentActionURL();
}
Thanks,
Mark
_______________________________________________
Do not post admin requests to the list. They will be ignored.
Webobjects-dev mailing list ([email protected])
Help/Unsubscribe/Update your Subscription:
https://lists.apple.com/mailman/options/webobjects-dev/archive%40mail-archive.com
This email sent to [email protected]
