diff options
| author | Mario Vavti <mario@mariovavti.com> | 2018-04-12 14:46:36 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2018-04-12 14:46:36 +0200 |
| commit | 7c47b9d75ca02ce46175ee3bc0b54e27e8061621 (patch) | |
| tree | ba7b1a6be60040f31e099e1cd30849b50a3ba1ae /view/js/main.js | |
| parent | 09a8b4b379d91dd62f38c116c99187a404d7e774 (diff) | |
| parent | 549f7a53b11d014993fbb550de97b6cdf45e0843 (diff) | |
| download | volse-hubzilla-7c47b9d75ca02ce46175ee3bc0b54e27e8061621.tar.gz volse-hubzilla-7c47b9d75ca02ce46175ee3bc0b54e27e8061621.tar.bz2 volse-hubzilla-7c47b9d75ca02ce46175ee3bc0b54e27e8061621.zip | |
Merge remote-tracking branch 'mike/master' into dev
Diffstat (limited to 'view/js/main.js')
| -rw-r--r-- | view/js/main.js | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/view/js/main.js b/view/js/main.js index ab950e4fb..02f2f6a3d 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -1466,7 +1466,6 @@ function b2h(s) { rep(/\[img=(.*?)x(.*?)\](.*?)\[\/img\]/gi,"<img width=\"$1\" height=\"$2\" src=\"$3\" />"); rep(/\[img\](.*?)\[\/img\]/gi,"<img src=\"$1\" />"); - // FIXME - add zid() rep(/\[zrl=([^\]]+)\](.*?)\[\/zrl\]/gi,"<a href=\"$1" + '?f=&zid=' + zid + "\">$2</a>"); rep(/\[zrl\](.*?)\[\/zrl\]/gi,"<a href=\"$1" + '?f=&zid=' + zid + "\">$1</a>"); rep(/\[zmg=(.*?)x(.*?)\](.*?)\[\/zmg\]/gi,"<img width=\"$1\" height=\"$2\" src=\"$3" + '?f=&zid=' + zid + "\" />"); |