Permalink
Browse files

Make url::merge() function use the same exact definition as url_Core:…

…:merge()
  • Loading branch information...
1 parent 69897b4 commit 86fd81ef2661718914e1d4eb63108a864b6ac14c @bharat bharat committed Jan 31, 2010
Showing with 2 additions and 2 deletions.
  1. +2 −2 modules/gallery/helpers/MY_url.php
@@ -93,8 +93,8 @@ static function abs_current($qs=false) {
/**
* Just like url::merge except that it escapes any XSS in the path.
*/
- static function merge($params) {
- return htmlspecialchars(parent::merge($params));
+ static function merge(array $arguments) {
+ return htmlspecialchars(parent::merge($arguments));
}
/**

0 comments on commit 86fd81e

Please sign in to comment.