[Phpbb-php5mod-cvs-checkins] phpbb-php5/includes bbcode.php,1.2,1.3 usercp_avatar.php,1.3,1.4 usercp
Brought to you by:
jelly_doughnut
|
From: Josh <jel...@us...> - 2005-06-27 20:18:00
|
Update of /cvsroot/phpbb-php5mod/phpbb-php5/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10348/includes Modified Files: bbcode.php usercp_avatar.php usercp_register.php Log Message: 2.0.16.4 Index: usercp_register.php =================================================================== RCS file: /cvsroot/phpbb-php5mod/phpbb-php5/includes/usercp_register.php,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** usercp_register.php 8 May 2005 02:12:44 -0000 1.5 --- usercp_register.php 27 Jun 2005 20:16:40 -0000 1.6 *************** *** 452,455 **** --- 452,456 ---- $avatar_sql = user_avatar_delete($userdata['user_avatar_type'], $userdata['user_avatar']); } + else if ( ( !empty($user_avatar_upload) || !empty($user_avatar_name) ) && $board_config['allow_avatar_upload'] ) Index: bbcode.php =================================================================== RCS file: /cvsroot/phpbb-php5mod/phpbb-php5/includes/bbcode.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** bbcode.php 8 May 2005 02:12:44 -0000 1.2 --- bbcode.php 27 Jun 2005 20:16:37 -0000 1.3 *************** *** 205,213 **** // [url]www.phpbb.com[/url] code.. (no xxxx:// prefix). ! $patterns[] = "#\[url\]((www|ftp)\.[^ \"\n\r\t<]*?)\[/url\]#is"; ! $replacements[] = $bbcode_tpl['url2']; ! // [url=xxxx://www.phpbb.com]phpBB[/url] code.. ! $patterns[] = "#\[url=([\w]+?://[^ \"\n\r\t<]*?)\]([^?].*?)\[/url\]#i"; $replacements[] = $bbcode_tpl['url3']; --- 205,213 ---- // [url]www.phpbb.com[/url] code.. (no xxxx:// prefix). ! $patterns[] = "#\[url=([\w]+?://[^ \"\n\r\t<]*?)\]([^?\n\r\t].*?)\[/url\]#is"; ! $replacements[] = $bbcode_tpl['url3']; ! // [url=www.phpbb.com]phpBB[/url] code.. (no xxxx:// prefix). ! $patterns[] = "#\[url=((www|ftp)\.[^ \"\n\r\t<]*?)\]([^?\n\r\t].*?)\[/url\]#is"; $replacements[] = $bbcode_tpl['url3']; Index: usercp_avatar.php =================================================================== RCS file: /cvsroot/phpbb-php5mod/phpbb-php5/includes/usercp_avatar.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** usercp_avatar.php 16 Apr 2005 21:02:23 -0000 1.3 --- usercp_avatar.php 27 Jun 2005 20:16:39 -0000 1.4 *************** *** 200,204 **** } ! if ( $width <= $board_config['avatar_max_width'] && $height <= $board_config['avatar_max_height'] ) { $new_filename = uniqid(rand()) . $imgtype; --- 200,204 ---- } ! if ( $width > 0 && $height > 0 && $width <= $board_config['avatar_max_width'] && $height <= $board_config['avatar_max_height'] ) { $new_filename = uniqid(rand()) . $imgtype; |