diff options
| author | KHobbits <rob@khobbits.co.uk> | 2012-03-23 13:26:03 +0000 |
|---|---|---|
| committer | KHobbits <rob@khobbits.co.uk> | 2012-03-23 13:26:03 +0000 |
| commit | c503adabc5ab0e2780fa0faeadfe1008112d9019 (patch) | |
| tree | df595370d2ce5b87d69c5a9afdb81e4478eb78dd | |
| parent | 5c0b522026654f45a93e8b8a36a851147cd62919 (diff) | |
| download | Essentials-c503adabc5ab0e2780fa0faeadfe1008112d9019.tar Essentials-c503adabc5ab0e2780fa0faeadfe1008112d9019.tar.gz Essentials-c503adabc5ab0e2780fa0faeadfe1008112d9019.tar.lz Essentials-c503adabc5ab0e2780fa0faeadfe1008112d9019.tar.xz Essentials-c503adabc5ab0e2780fa0faeadfe1008112d9019.zip | |
Fix url matching.
| -rw-r--r-- | Essentials/src/com/earth2me/essentials/Util.java | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/Essentials/src/com/earth2me/essentials/Util.java b/Essentials/src/com/earth2me/essentials/Util.java index 48eb770b2..510ab8a9a 100644 --- a/Essentials/src/com/earth2me/essentials/Util.java +++ b/Essentials/src/com/earth2me/essentials/Util.java @@ -495,7 +495,7 @@ public class Util } return buf.toString(); } - private static transient final Pattern URL_PATTERN = Pattern.compile("^((?:(?:https?)://)?[\\w-_\\.]{2,})\\.([a-z]{2,3}(?:/\\S+)?)$"); + private static transient final Pattern URL_PATTERN = Pattern.compile("((?:(?:https?)://)?[\\w-_\\.]{2,})\\.([a-z]{2,3}(?:/\\S+)?)"); private static transient final Pattern VANILLA_PATTERN = Pattern.compile("\u00A7+[0-9A-FK-ORa-fk-or]"); private static transient final Pattern REPLACE_PATTERN = Pattern.compile("&([0-9a-fk-or])"); private static transient final Pattern VANILLA_COLOR_PATTERN = Pattern.compile("\u00A7+[0-9A-Fa-f]"); @@ -529,7 +529,12 @@ public class Util { return null; } - return URL_PATTERN.matcher(input).replaceAll("$1 $2"); + String text = URL_PATTERN.matcher(input).replaceAll("$1 $2"); + while (URL_PATTERN.matcher(text).find()) + { + text = URL_PATTERN.matcher(text).replaceAll("$1 $2"); + } + return text; } public static String formatString(final IUser user, final String permBase, final String input) |