From 2862a445293dc26f4457f4db3fee6356544f7abe Mon Sep 17 00:00:00 2001
From: nanosimbiot <nanosimbiot@a8ac35ab-4ca4-ca47-4c2d-a49a94f06293>
Date: Mon, 4 Jul 2011 07:52:56 +0000
Subject: [PATCH] r72
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

рашен ссылки git-svn-id: https://torrentpier2.googlecode.com/svn/trunk@72 a8ac35ab-4ca4-ca47-4c2d-a49a94f06293
---
 upload/includes/bbcode.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/upload/includes/bbcode.php b/upload/includes/bbcode.php
index 68ba37555..f4df924db 100644
--- a/upload/includes/bbcode.php
+++ b/upload/includes/bbcode.php
@@ -798,11 +798,12 @@ class bbcode
 			(?<![\"'=])
 			\b
 			(
-				https?://[\w\#$%&~/.\-;:=?@\[\]+]+
+				(https?://|ftp://|www\.|ftp\.)
+				[\w\#!$%&~/.\-;:=?@а-яА-Я\[\]+]+
 			)
 			(?![\"']|\[/url|\[/img|</a)
 			(?=[,!]?\s|[\)<!])
-		#xi";
+		#xiu";
 
 		// pad it with a space so we can match things at the start of the 1st line.
 		$ret = " $text ";