aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEgil Moeller <egil.moller@freecode.no>2010-04-04 20:22:25 +0200
committerEgil Moeller <egil.moller@freecode.no>2010-04-04 20:22:25 +0200
commit5e5e8640ff6757a059025adb3f5d6dc95dcc22a5 (patch)
tree5de27a385fb88b817922e3e8122867de869629e2
parent49c31d0d5b028bf7a5c79a23192853e6aa3a43b1 (diff)
downloadetherpad-5e5e8640ff6757a059025adb3f5d6dc95dcc22a5.tar.gz
etherpad-5e5e8640ff6757a059025adb3f5d6dc95dcc22a5.tar.xz
etherpad-5e5e8640ff6757a059025adb3f5d6dc95dcc22a5.zip
Oups, variable mismatch bugfix
-rw-r--r--etherpad/src/etherpad/admin/plugins.js7
1 files changed, 4 insertions, 3 deletions
diff --git a/etherpad/src/etherpad/admin/plugins.js b/etherpad/src/etherpad/admin/plugins.js
index 384817f..385e2ca 100644
--- a/etherpad/src/etherpad/admin/plugins.js
+++ b/etherpad/src/etherpad/admin/plugins.js
@@ -228,12 +228,13 @@ function callHook(hookName, args) {
if (hooks[hookName] === undefined)
return [];
var res = [];
- for (i = 0; i < hooks[hookName].length; i++) {
+
+ for (var i = 0; i < hooks[hookName].length; i++) {
var plugin = hooks[hookName][i];
var pluginRes = pluginModules[plugin.plugin][plugin.original || hookName](args);
if (pluginRes != undefined && pluginRes != null)
- for (var i = 0; i < pluginRes.length; i++)
- res.push(pluginRes[i]); /* Don't use Array.concat as it flatterns arrays within the array */
+ for (var j = 0; j < pluginRes.length; j++)
+ res.push(pluginRes[j]); /* Don't use Array.concat as it flatterns arrays within the array */
}
return res;
}