Permalink
Browse files

MINOR Documentation (from r98372)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102646 467b73ca-7a2a-4603-9d3b-597d59a354a9
  • Loading branch information...
1 parent 4f84761 commit e43f6d8a0de9b38bc704d966aa893849620f778f @chillu chillu committed Apr 13, 2010
Showing with 9 additions and 4 deletions.
  1. +9 −4 core/control/Controller.php
@@ -535,10 +535,15 @@ function isAjax() {
}
/**
- * Joins two link segments together, putting a slash between them if necessary.
- * Use this for building the results of Link() methods.
- *
- * If either of the links have query strings, then they will be combined and put at the end of the resulting url.
+ * Joins two or more link segments together, putting a slash between them if necessary.
+ * Use this for building the results of {@link Link()} methods.
+ * If either of the links have query strings,
+ * then they will be combined and put at the end of the resulting url.
+ *
+ * Caution: All parameters are expected to be URI-encoded already.
+ *
+ * @param String
+ * @return String
*/
static function join_links() {
$args = func_get_args();

0 comments on commit e43f6d8

Please sign in to comment.