diff options
| author | Callum Macrae <callum@lynxphp.com> | 2011-10-22 16:42:22 +0100 |
|---|---|---|
| committer | Igor Wiedler <igor@wiedler.ch> | 2012-03-31 02:09:20 +0200 |
| commit | 415d33f20dd09483b151ae8253c2d97a47f5a9ff (patch) | |
| tree | b96f293da9e48d6868f5b865ce7905c962629e83 /phpBB/assets | |
| parent | 8a2f5f326930469ff85ea7d8ef3458fe4b6def48 (diff) | |
| download | forums-415d33f20dd09483b151ae8253c2d97a47f5a9ff.tar forums-415d33f20dd09483b151ae8253c2d97a47f5a9ff.tar.gz forums-415d33f20dd09483b151ae8253c2d97a47f5a9ff.tar.bz2 forums-415d33f20dd09483b151ae8253c2d97a47f5a9ff.tar.xz forums-415d33f20dd09483b151ae8253c2d97a47f5a9ff.zip | |
[ticket/10271] Renamed the "act" js variable to "action".
PHPBB3-10271
Diffstat (limited to 'phpBB/assets')
| -rw-r--r-- | phpBB/assets/javascript/core.js | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/phpBB/assets/javascript/core.js b/phpBB/assets/javascript/core.js index fe85bd9780..bb3f10ac0f 100644 --- a/phpBB/assets/javascript/core.js +++ b/phpBB/assets/javascript/core.js @@ -226,7 +226,7 @@ phpbb.ajaxify = function(options, refresh, callback) { } selector.click(function() { - var act, data, path, that = this; + var action, data, path, that = this; if ($(this).data('ajax') == false) { @@ -302,21 +302,21 @@ phpbb.ajaxify = function(options, refresh, callback) { var run_exception = (typeof options.exception === 'function'); if (is_form) { - act = /action\[([a-z]+)\]/.exec(this.name); + action = /action\[([a-z]+)\]/.exec(this.name); data = decodeURI($(this).closest('form').serialize()); path = $(this).closest('form').attr('action').replace('&', '&'); - if (act) + if (action) { - act = act[1] - data += '&action=' + act; + action = action[1] + data += '&action=' + action; } else { data += '&' + this.name + '=' + this.value; } - if (run_exception && options.exception($(this).parents('form'), act, data)) + if (run_exception && options.exception($(this).parents('form'), action, data)) { return true; } |