- remove output buffering options from download.php (not needed anymore)

- optimized viewtopic.php a little bit
- removed the create_function (was consuming too much memory) from viewtopic
- check for manually added convert[.exe] program name to imagemagick path in admin_attachments
- reduced filesize checking for imagemagick program (some installations require less than 20k)
- added checked="checked" for "not selected" topic icon
- moved parse_text_display function from functions_posting.php to functions.php (see comment above function)
- check for user_id != ANONYMOUS in page_footer for displaying the administration link (there seems to be a problem checking for global options)
- rewrote attachment thumbnail functions - utilize GD2 functions if available, more uptodate checks...
- changed final thumbnail size calculation
- define S_ROW_COUNT within template class itself
- added SID to template vars in page_header
- added ability to view topic/forum within admin_viewlogs
- added optional acl checking to make_jumpbox, no need to duplicate the function for this small need
- added custom body file for confirm_box


git-svn-id: file:///svn/phpbb/trunk@4920 89ea8834-ac86-4346-8a33-228a782c2dd0

phpBB/includes/ucp/ucp_pm_viewmessage.php

@@ -286,7 +286,6 @@ function message_history($msg_id, $user_id, $message_row, $folder)
 
 	$title = censor_text($title);
 
-	$i = 1;
 	$url = "{$phpbb_root_path}ucp.$phpEx$SID&i=pm";
 	$next_history_pm = $previous_history_pm = $prev_id = 0;
 	
@@ -329,13 +328,10 @@ function message_history($msg_id, $user_id, $message_row, $folder)
 			'U_VIEW_MESSAGE'=> "$url&f=$folder_id&p=" . $row['msg_id'],
 			'U_AUTHOR_PROFILE' 	=> "{$phpbb_root_path}memberlist.$phpEx$SID&mode=viewprofile&u=$author_id",
 			'U_QUOTE' 		=> ($config['auth_quote_pm'] && $auth->acl_get('u_sendpm') && $author_id != $user->data['user_id']) ? "$url&mode=compose&action=quote&f=" . $folder_id . "&p=" . $row['msg_id'] : '', 
-			'U_POST_REPLY_PM' 	=> ($author_id != $user->data['user_id'] && $auth->acl_get('u_sendpm')) ? "$url&mode=compose&action=reply&f=$folder_id&p=" . $row['msg_id'] : '',
-
-			'S_ROW_COUNT'	=> $i)
+			'U_POST_REPLY_PM' 	=> ($author_id != $user->data['user_id'] && $auth->acl_get('u_sendpm')) ? "$url&mode=compose&action=reply&f=$folder_id&p=" . $row['msg_id'] : '')
 		);
 		unset($rowset[$id]);
 		$prev_id = $id;
-		$i++;
 	}
 
 	$template->assign_vars(array(