aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/styles
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2013-07-18 18:14:03 +0200
committerAndreas Fischer <bantu@phpbb.com>2013-07-18 18:14:03 +0200
commit29322e85ff31d1a71a07846241dd809972323340 (patch)
tree3cb3f0885de0e4de8b75f00b3a410169127c8fc7 /phpBB/styles
parent32ffae605fc26be35dd4d0fd4efa0e005c49ac48 (diff)
parentd05c04ae40326768e35464d42e3bd9e51b140155 (diff)
downloadforums-29322e85ff31d1a71a07846241dd809972323340.tar
forums-29322e85ff31d1a71a07846241dd809972323340.tar.gz
forums-29322e85ff31d1a71a07846241dd809972323340.tar.bz2
forums-29322e85ff31d1a71a07846241dd809972323340.tar.xz
forums-29322e85ff31d1a71a07846241dd809972323340.zip
Merge remote-tracking branch 'cyberalien/ticket/11712' into develop
* cyberalien/ticket/11712: [ticket/11712] Fixing typo in editor.js
Diffstat (limited to 'phpBB/styles')
-rw-r--r--phpBB/styles/prosilver/template/editor.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/styles/prosilver/template/editor.js b/phpBB/styles/prosilver/template/editor.js
index 235cc0025b..4c70ee345f 100644
--- a/phpBB/styles/prosilver/template/editor.js
+++ b/phpBB/styles/prosilver/template/editor.js
@@ -301,7 +301,7 @@ function colorPalette(dir, width, height) {
var r = 0,
g = 0,
b = 0,
- numberList = new Array(6);
+ numberList = new Array(6),
color = '',
html = '';