Merge pull request #665 from pupi1985/patch-112

Remove some deprecation messages

qa-include/app/options.php

@@ -108,15 +108,6 @@ function qa_opt_if_loaded($name)
 
 
 /**
- * @deprecated Deprecated since Q2A 1.3 now that all options are retrieved together.
- * @param $names
- */
-function qa_options_set_pending($names)
-{
-}
-
-
-/**
  * Load all of the Q2A options from the database.
  * From Q2A 1.8 we always load the options in a separate query regardless of QA_OPTIMIZE_DISTANT_DB.
  */

qa-include/plugins/qa-filter-basic.php

@@ -170,11 +170,8 @@ class qa_filter_basic
 
 	/**
 	 * Wrapper function for validating a post's email address.
-	 *
-	 * @deprecated This function will become private in Q2A 1.8. It is specific to this plugin and
-	 * should not be used by outside code.
 	 */
-	public function validate_post_email(&$errors, $post)
+	private function validate_post_email(&$errors, $post)
 	{
 		if (@$post['notify'] && strlen(@$post['email'])) {
 			$error = $this->filter_email($post['email'], null);

qa-include/plugins/qa-layer-voters-flaggers.php

@@ -142,11 +142,7 @@ class qa_html_theme_layer extends qa_html_theme_base
 
 	// Utility functions for this layer
 
-	/**
-	 * @deprecated This function will become private in Q2A 1.8. It is specific to this plugin and
-	 * should not be used by outside code.
-	 */
-	public function queue_post_voters_flaggers($post)
+	private function queue_post_voters_flaggers($post)
 	{
 		if (!qa_user_post_permit_error('permit_view_voters_flaggers', $post)) {
 			$postkeys = array('postid', 'opostid');
@@ -157,11 +153,7 @@ class qa_html_theme_layer extends qa_html_theme_base
 		}
 	}
 
-	/**
-	 * @deprecated This function will become private in Q2A 1.8. It is specific to this plugin and
-	 * should not be used by outside code.
-	 */
-	public function queue_raw_posts_voters_flaggers($posts)
+	private function queue_raw_posts_voters_flaggers($posts)
 	{
 		if (is_array($posts)) {
 			foreach ($posts as $post) {
@@ -171,11 +163,7 @@ class qa_html_theme_layer extends qa_html_theme_base
 		}
 	}
 
-	/**
-	 * @deprecated This function will become private in Q2A 1.8. It is specific to this plugin and
-	 * should not be used by outside code.
-	 */
-	public function retrieve_queued_voters_flaggers()
+	private function retrieve_queued_voters_flaggers()
 	{
 		if (count($this->qa_voters_flaggers_queue)) {
 			require_once QA_INCLUDE_DIR . 'db/votes.php';
@@ -208,11 +196,7 @@ class qa_html_theme_layer extends qa_html_theme_base
 		}
 	}
 
-	/**
-	 * @deprecated This function will become private in Q2A 1.8. It is specific to this plugin and
-	 * should not be used by outside code.
-	 */
-	public function get_post_voters_flaggers($post, $postid)
+	private function get_post_voters_flaggers($post, $postid)
 	{
 		require_once QA_INCLUDE_DIR . 'util/sort.php';
 

qa-plugin/wysiwyg-editor/qa-wysiwyg-editor.php

@@ -252,21 +252,13 @@ class qa_wysiwyg_editor
 	}
 
 
-	/**
-	 * @deprecated This function will become private in Q2A 1.8. It is specific to this plugin and
-	 * should not be used by outside code.
-	 */
-	public function html_to_text($html)
+	private function html_to_text($html)
 	{
 		$viewer = qa_load_module('viewer', '');
 		return $viewer->get_text($html, 'html', array());
 	}
 
-	/**
-	 * @deprecated This function will become private in Q2A 1.8. It is specific to this plugin and
-	 * should not be used by outside code.
-	 */
-	public function bytes_to_mega($bytes)
+	private function bytes_to_mega($bytes)
 	{
 		return $bytes / 1048576;
 	}

qa-plugin/xml-sitemap/qa-xml-sitemap.php

@@ -267,11 +267,7 @@ class qa_xml_sitemap
 	}
 
 
-	/**
-	 * @deprecated This function will become private in Q2A 1.8. It is specific to this plugin and
-	 * should not be used by outside code.
-	 */
-	public function sitemap_output($request, $priority)
+	private function sitemap_output($request, $priority)
 	{
 		echo "\t<url>\n" .
 			"\t\t<loc>" . qa_xml(qa_path($request, null, qa_opt('site_url'))) . "</loc>\n" .