diff options
| author | lisps <stummp@loewen.de> | 2014-09-26 12:48:02 +0200 |
|---|---|---|
| committer | lisps <stummp@loewen.de> | 2014-09-26 12:48:02 +0200 |
| commit | 8d39e80d363eda2ef31dac8473bfdab4b9cd7ce5 (patch) | |
| tree | 7bab1caccbc0de7c30f0e610d1e5ee9b3c67d564 /lib/scripts/fileuploader.js | |
| parent | 115aab0f5fca76360c50f759f587229ff327105d (diff) | |
| parent | 7b950f2d59050052c1d9251b0bd9bd40c7441040 (diff) | |
| download | rpg-8d39e80d363eda2ef31dac8473bfdab4b9cd7ce5.tar.gz rpg-8d39e80d363eda2ef31dac8473bfdab4b9cd7ce5.tar.bz2 | |
Merge remote-tracking branch master into revisions
Diffstat (limited to 'lib/scripts/fileuploader.js')
| -rw-r--r-- | lib/scripts/fileuploader.js | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/scripts/fileuploader.js b/lib/scripts/fileuploader.js index e75b8d3a5..d6278950b 100644 --- a/lib/scripts/fileuploader.js +++ b/lib/scripts/fileuploader.js @@ -226,7 +226,9 @@ qq.obj2url = function(obj, temp, prefixDone){ } else if ((typeof obj != 'undefined') && (obj !== null) && (typeof obj === "object")){ // for anything else but a scalar, we will use for-in-loop for (var i in obj){ - add(obj[i], i); + if(obj.hasOwnProperty(i) && typeof obj[i] != 'function') { + add(obj[i], i); + } } } else { uristrings.push(encodeURIComponent(temp) + '=' + encodeURIComponent(obj)); |