summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
authorBharat Mediratta <bharat@menalto.com>2010-01-30 17:41:48 -0800
committerBharat Mediratta <bharat@menalto.com>2010-01-30 17:41:48 -0800
commit86fd81ef2661718914e1d4eb63108a864b6ac14c (patch)
tree83e40ba7c3183e3b08a98367eaffeca7b6cbc4d0 /modules
parent69897b4c66e22607162ba8a1ae8c95c8f616f03a (diff)
Make url::merge() function use the same exact definition as url_Core::merge()
Diffstat (limited to 'modules')
-rw-r--r--modules/gallery/helpers/MY_url.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/gallery/helpers/MY_url.php b/modules/gallery/helpers/MY_url.php
index 8a7909b6..323cae37 100644
--- a/modules/gallery/helpers/MY_url.php
+++ b/modules/gallery/helpers/MY_url.php
@@ -93,8 +93,8 @@ class url extends url_Core {
/**
* 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));
}
/**