Merge remote-tracking branch 'origin/master-1.3.x'

Conflicts:
	docbook/Admin_Guide/en-US/Installation.xml
	lang/strings_czech.txt

admin/install.php

@@ -273,8 +273,25 @@ function print_test( $p_test_description, $p_result, $p_hard_fail = true, $p_mes
 	?>
 
 <!-- Check PHP Version -->
-<?php print_test( ' Checking PHP version (your version is ' . phpversion() . ')', check_php_version( phpversion() ), true, 'Upgrade to a more recent version of PHP' );?>
+<?php
+	print_test(
+		'Checking PHP version (your version is ' . phpversion() . ')',
+		check_php_version( phpversion() ),
+		true,
+		'Upgrade to a more recent version of PHP'
+	);
 
+	# UTF-8 support check
+	# We need either the 'mbstring' extension, or the utf8_encode() function
+	# (part of the 'XML parser' extension) as a fallback for Unicode support
+	# by the utf8 library.
+	print_test(
+		'Checking UTF-8 support',
+		extension_loaded( 'mbstring' ) || function_exists( 'utf8_encode' ),
+		true,
+		'Please install or enable the PHP mbstring extension'
+	);
+?>
 <!-- Check Safe Mode -->
 <?php
 print_test( 'Checking if safe mode is enabled for install script',
@@ -335,8 +352,8 @@ function print_test( $p_test_description, $p_result, $p_hard_fail = true, $p_mes
 
 # got database information, check and install
 if( 2 == $t_install_state ) {
-    # By now user has picked a timezone, ensure it is set
-    date_default_timezone_set( $f_timezone );
+	# By now user has picked a timezone, ensure it is set
+	date_default_timezone_set( $f_timezone );
 ?>
 
 <div class="col-md-12 col-xs-12">

bug_actiongroup.php

@@ -122,7 +122,6 @@
 			break;
 		case 'DELETE':
 			if( access_has_bug_level( config_get( 'delete_bug_threshold' ), $t_bug_id ) ) {
-				event_signal( 'EVENT_BUG_DELETED', array( $t_bug_id ) );
 				bug_delete( $t_bug_id );
 			} else {
 				$t_failed_ids[$t_bug_id] = lang_get( 'bug_actiongroup_access' );

core.php

@@ -212,6 +212,14 @@ function __autoload( $p_class ) {
 require_api( 'database_api.php' );
 require_api( 'config_api.php' );
 
+# Set the default timezone
+# To reduce overhead, we assume that the timezone configuration is valid,
+# i.e. it exists in timezone_identifiers_list(). If not, a PHP NOTICE will
+# be raised. Use admin checks to validate configuration.
+@date_default_timezone_set( config_get_global( 'default_timezone' ) );
+$t_tz = @date_default_timezone_get();
+config_set_global( 'default_timezone', $t_tz, true );
+
 if( !defined( 'MANTIS_MAINTENANCE_MODE' ) ) {
 	if( OFF == $g_use_persistent_connections ) {
 		db_connect( config_get_global( 'dsn', false ), $g_hostname, $g_db_username, $g_db_password, $g_database_name );
@@ -239,25 +247,17 @@ function __autoload( $p_class ) {
 	$g_login_anonymous = true;
 }
 
-# Set the current timezone
 if( !defined( 'MANTIS_MAINTENANCE_MODE' ) ) {
 	require_api( 'authentication_api.php' );
 
-	# To reduce overhead, we assume that the timezone configuration is valid,
-	# i.e. it exists in timezone_identifiers_list(). If not, a PHP NOTICE will
-	# be raised. Use admin checks to validate configuration.
-	@date_default_timezone_set( config_get_global( 'default_timezone' ) );
-	$t_tz = @date_default_timezone_get();
-	config_set_global( 'default_timezone', $t_tz, true );
-
+	# Override the default timezone according to user's preferences
 	if( auth_is_user_authenticated() ) {
-		# Determine the current timezone according to user's preferences
 		require_api( 'user_pref_api.php' );
 		$t_tz = user_pref_get_pref( auth_get_current_user_id(), 'timezone' );
 		@date_default_timezone_set( $t_tz );
 	}
-	unset( $t_tz );
 }
+unset( $t_tz );
 
 # Cache current user's collapse API data
 if( !defined( 'MANTIS_MAINTENANCE_MODE' ) ) {

core/bug_api.php

@@ -1351,6 +1351,8 @@ function bug_delete( $p_bug_id ) {
 	# call pre-deletion custom function
 	helper_call_custom_function( 'issue_delete_validate', array( $p_bug_id ) );
 
+	event_signal( 'EVENT_BUG_DELETED', array( $c_bug_id ) );
+
 	# log deletion of bug
 	history_log_event_special( $p_bug_id, BUG_DELETED, bug_format_id( $p_bug_id ) );
 

docbook/Admin_Guide/en-US/Installation.xml

@@ -165,49 +165,53 @@
 						as possible. Hence the required extensions are minimal
 						and many of them are optional affecting only one
 						feature.
-						<itemizedlist>
-							<listitem><para><emphasis>mandatory</emphasis>:
-								the extension for the RDBMS being used (
-									mysqli,
-									pgsql,
-									oci8,
-									sqlsrv
-								)
-							</para></listitem>
-
-							<listitem><para><emphasis>Curl</emphasis> -
-								required for the Twitter integration feature
-							</para></listitem>
-
-							<listitem><para><emphasis>GD</emphasis> -
-								required for the captcha and graphs features
-							</para></listitem>
-
-							<listitem>
-								<para><emphasis>Fileinfo</emphasis> -
-									Guesses the MIME type of attachments
-								</para>
-								<para>Without this extension, file attachment
-									previews and downloads may not work
-									correctly as MantisBT won't be able to send
-									the Content-Type header to a browser
-									requesting an attachment.
-								</para>
-								<para>This extension is included by default from
-									PHP version 5.3.x and above.
-							</para></listitem>
-
-							<listitem><para><emphasis>mbstring</emphasis> -
-								Recommended for best performance with multibyte
-								(UTF8) strings processing. Required if the admin
-								needs to list the SQL queries generated by
-								MantisBT (see
-								<emphasis>$g_log_level / LOG_DATABASE</emphasis>
-								in <xref linkend="admin.config.logging" />).
-							</para></listitem>
-
-						</itemizedlist>
 					</para>
+
+					<variablelist>
+						<varlistentry>
+							<term>Mandatory extensions</term>
+							<listitem><itemizedlist>
+								<listitem><para>The extension for the RDBMS being used (
+										mysql/mysqli,
+										pgsql,
+										oci8,
+										sqlsrv
+									)
+								</para></listitem>
+								<listitem><para><emphasis>mbstring</emphasis> -
+									Required for Unicode (UTF-8) support.
+								</para></listitem>
+							</itemizedlist></listitem>
+						</varlistentry>
+
+						<varlistentry>
+							<term>Optional extensions</term>
+							<listitem><itemizedlist>
+								<listitem><para><emphasis>Curl</emphasis> -
+									required for the Twitter integration feature
+								</para></listitem>
+
+								<listitem><para><emphasis>GD</emphasis> -
+									required for the captcha and graphs features
+								</para></listitem>
+
+								<listitem>
+									<para><emphasis>Fileinfo</emphasis> -
+										Guesses the MIME type of attachments
+									</para>
+									<para>Without this extension, file attachment
+										previews and downloads may not work
+										correctly as MantisBT won't be able to send
+										the Content-Type header to a browser
+										requesting an attachment.
+									</para>
+									<para>This extension is included by default from
+										PHP version 5.3.x and above.
+								</para></listitem>
+							</itemizedlist></listitem>
+						</varlistentry>
+
+					</variablelist>
 				</listitem>
 
 				<listitem>

docbook/Admin_Guide/en-US/Project_Management.xml

@@ -219,10 +219,6 @@ http://www.example.com/mantisbt/project_page.php?project_id=1
     <section id="admin.project.timetracking">
         <title>Time Tracking</title>
 
-        <para>
-					This is currently a work in progress. To follow the work have a look on the wiki page <ulink url="http://www.mantisbt.org/wiki/doku.php/mantisbt:issue:4428">Time Tracking (Issue 4428)</ulink>
-				</para>
-
         <para>
 					To activate the Time Tracking feature you have to set the configuration option "time_tracking_enabled" to ON. To activating the Time Tracking you can :
 					<itemizedlist>

issues_rss.php

@@ -44,6 +44,9 @@
  * @uses utility_api.php
  */
 
+# Prevent output of HTML in the content if errors occur
+define( 'DISABLE_INLINE_ERROR_REPORTING', true );
+
 require_once( 'core.php' );
 require_api( 'access_api.php' );
 require_api( 'bug_api.php' );

lang/strings_chinese_simplified.txt

@@ -376,7 +376,7 @@ $s_update_sponsorship_button = '修改支付状态';
 $s_no_sponsored = '找不到分配给您自己的已资助问题。';
 $s_own_sponsored = '您已经资助的问题：';
 $s_issues_handled = '分派给你的已资助的问题：';
-$s_no_own_sponsored = '你没有资助任何问题。';
+$s_no_own_sponsored = '您没有资助任何问题。';
 $s_sponsor = '资助';
 $s_sponsor_verb = '资助';
 $s_amount = '金额';
@@ -808,7 +808,7 @@ $s_my_view_title_verify = '正在等待我的解决程度确认';
 $s_my_view_title_my_comments = '评述过的问题';
 $s_news_added_msg = '新闻已添加...';
 $s_news_deleted_msg = '已删除新闻...';
-$s_delete_news_sure_msg = '你确定要删除此新闻？';
+$s_delete_news_sure_msg = '您确定要删除此新闻项目么？';
 $s_delete_news_item_button = '删除新闻';
 $s_edit_news_title = '编辑新闻';
 $s_headline = '标题';
@@ -1073,7 +1073,7 @@ $s_replace_relationship_button = '替换';
 $s_replace_relationship_sure_msg = '在这两个问题间已经有一个关联，要替换现有的关联吗？';
 $s_relationship_with_parent = '与上级问题关联';
 $s_delete_relationship_button = '删除';
-$s_delete_relationship_sure_msg = '你确定要删除该关联吗？';
+$s_delete_relationship_sure_msg = '您确定要删除该关联吗？';
 $s_relationship_warning_blocking_bugs_not_resolved = '当前问题的部分子项还没有解决或关闭。';
 $s_relationship_warning_blocking_bugs_not_resolved_2 = '<strong>注意：</strong>当前问题的部分子项还没有解决或关闭。<br />在<strong>解决或关闭</strong>一个父问题前，应该解决或关闭所有相关联的子项问题。';
 $s_create_child_bug_button = '创建子问题';
@@ -1115,7 +1115,7 @@ $s_view_list_of_attachments = '查看附件列表';
 $s_download_attachments = '下载附件';
 $s_delete_attachments = '删除附件';
 $s_delete_attachment_button = '删除';
-$s_delete_attachment_sure_msg = '你确定要删除该附件吗？';
+$s_delete_attachment_sure_msg = '您确定要删除该附件吗？';
 $s_upload_issue_attachments = '上传问题相关附件';
 $s_filters = '过滤器';
 $s_save_filters = '保存过滤器';
@@ -1261,7 +1261,7 @@ $s_timeline_more = '更多事件…';
 $s_missing_error_string = '缺少错误字符串：%1$s';
 $MANTIS_ERROR[ERROR_GENERIC] = '执行该操作时发生错误，你可能需要将此问题报告给你的系统管理员。';
 $MANTIS_ERROR[ERROR_SQL] = '发生SQL错误；';
-$MANTIS_ERROR[ERROR_REPORT] = '在你的报表中发现错误。';
+$MANTIS_ERROR[ERROR_REPORT] = '在您的报告中发现错误。';
 $MANTIS_ERROR[ERROR_NO_FILE_SPECIFIED] = '没有指定文件';
 $MANTIS_ERROR[ERROR_FILE_DISALLOWED] = '此类型的文件不允许上传';
 $MANTIS_ERROR[ERROR_NO_DIRECTORY] = '目录不存在；请检查项目设置。';