Merge branch 'pr/146' into dev

qa-include/app/options.php

@@ -339,6 +339,7 @@
 			'show_a_form_immediate' => 'if_no_as',
 			'show_c_reply_buttons' => 1,
 			'show_custom_welcome' => 0,
+			'show_post_update_meta' => 1,
 			'show_fewer_cs_count' => 5,
 			'show_fewer_cs_from' => 10,
 			'show_full_date_days' => 7,
@@ -549,7 +550,7 @@
 			'avatarsize' => qa_opt('avatar_q_list_size'),
 			'pointsview' => qa_opt('show_user_points'),
 			'pointstitle' => qa_opt('show_user_titles') ? qa_get_points_to_titles() : array(),
-			'updateview' => true,
+			'updateview' => qa_opt('show_post_update_meta'),
 			'blockwordspreg' => qa_get_block_words_preg(),
 			'showurllinks' => qa_opt('show_url_links'),
 			'linksnewwindow' => qa_opt('links_in_new_window'),

qa-include/lang/qa-lang-options.php

@@ -238,6 +238,7 @@
 		'show_custom_sidebar' => 'Custom HTML in sidebar box on every page:',
 		'show_custom_sidepanel' => 'Custom HTML in side panel on every page:',
 		'show_custom_welcome' => 'Custom message in email sent to new registered users:',
+		'show_post_update_meta' => 'Show edits/updates in post meta:',
 		'show_fewer_cs_count' => 'If partially hidden, show most recent:',
 		'show_fewer_cs_from' => 'Partially hide comments if more than:',
 		'show_full_date_days' => 'Show full date after:',

qa-include/pages/admin/admin-default.php

@@ -199,6 +199,7 @@
 		'show_custom_sidebar' => 'checkbox',
 		'show_custom_sidepanel' => 'checkbox',
 		'show_custom_welcome' => 'checkbox',
+		'show_post_update_meta' => 'checkbox',
 		'show_home_description' => 'checkbox',
 		'show_message_history' => 'checkbox',
 		'show_notice_visitor' => 'checkbox',
@@ -374,7 +375,7 @@
 			if (count(qa_get_points_to_titles()))
 				$showoptions[] = 'show_user_titles';
 
-			array_push($showoptions, 'show_user_points', '', 'sort_answers_by', 'show_selected_first', 'page_size_q_as', 'show_a_form_immediate');
+			array_push($showoptions, 'show_user_points', 'show_post_update_meta', '', 'sort_answers_by', 'show_selected_first', 'page_size_q_as', 'show_a_form_immediate');
 
 			if (qa_opt('comment_on_qs') || qa_opt('comment_on_as'))
 				array_push($showoptions, 'show_fewer_cs_from', 'show_fewer_cs_count', 'show_c_reply_buttons');