Merge branch '0.9.x' into 1.0.x

Conflicts:
	README
	lib/default.php
This commit is contained in:
Brion Vibber
2010-10-18 12:17:11 -07:00
15 changed files with 371 additions and 83 deletions

View File

@@ -319,7 +319,8 @@ $default =
'nofollow' =>
array('subscribers' => true,
'members' => true,
'peopletag' => true),
'peopletag' => true,
'external' => 'sometimes'), // Options: 'sometimes', 'never', default = 'sometimes'
'url' =>
array('shortener' => 'ur1.ca',
'maxlength' => 25,