Skip to content

Commit befe8b7

Browse files
committed
Remove some deprecation messages
1 parent 40f15d4 commit befe8b7

5 files changed

Lines changed: 8 additions & 48 deletions

File tree

qa-include/app/options.php

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -107,15 +107,6 @@ function qa_opt_if_loaded($name)
107107
}
108108

109109

110-
/**
111-
* @deprecated Deprecated since Q2A 1.3 now that all options are retrieved together.
112-
* @param $names
113-
*/
114-
function qa_options_set_pending($names)
115-
{
116-
}
117-
118-
119110
/**
120111
* Load all of the Q2A options from the database.
121112
* 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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -170,11 +170,8 @@ private function validate_field_length(&$errors, &$post, $key, $minlength, $maxl
170170

171171
/**
172172
* Wrapper function for validating a post's email address.
173-
*
174-
* @deprecated This function will become private in Q2A 1.8. It is specific to this plugin and
175-
* should not be used by outside code.
176173
*/
177-
public function validate_post_email(&$errors, $post)
174+
private function validate_post_email(&$errors, $post)
178175
{
179176
if (@$post['notify'] && strlen(@$post['email'])) {
180177
$error = $this->filter_email($post['email'], null);

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

Lines changed: 4 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -142,11 +142,7 @@ public function post_meta_flags($post, $class)
142142

143143
// Utility functions for this layer
144144

145-
/**
146-
* @deprecated This function will become private in Q2A 1.8. It is specific to this plugin and
147-
* should not be used by outside code.
148-
*/
149-
public function queue_post_voters_flaggers($post)
145+
private function queue_post_voters_flaggers($post)
150146
{
151147
if (!qa_user_post_permit_error('permit_view_voters_flaggers', $post)) {
152148
$postkeys = array('postid', 'opostid');
@@ -157,11 +153,7 @@ public function queue_post_voters_flaggers($post)
157153
}
158154
}
159155

160-
/**
161-
* @deprecated This function will become private in Q2A 1.8. It is specific to this plugin and
162-
* should not be used by outside code.
163-
*/
164-
public function queue_raw_posts_voters_flaggers($posts)
156+
private function queue_raw_posts_voters_flaggers($posts)
165157
{
166158
if (is_array($posts)) {
167159
foreach ($posts as $post) {
@@ -171,11 +163,7 @@ public function queue_raw_posts_voters_flaggers($posts)
171163
}
172164
}
173165

174-
/**
175-
* @deprecated This function will become private in Q2A 1.8. It is specific to this plugin and
176-
* should not be used by outside code.
177-
*/
178-
public function retrieve_queued_voters_flaggers()
166+
private function retrieve_queued_voters_flaggers()
179167
{
180168
if (count($this->qa_voters_flaggers_queue)) {
181169
require_once QA_INCLUDE_DIR . 'db/votes.php';
@@ -208,11 +196,7 @@ public function retrieve_queued_voters_flaggers()
208196
}
209197
}
210198

211-
/**
212-
* @deprecated This function will become private in Q2A 1.8. It is specific to this plugin and
213-
* should not be used by outside code.
214-
*/
215-
public function get_post_voters_flaggers($post, $postid)
199+
private function get_post_voters_flaggers($post, $postid)
216200
{
217201
require_once QA_INCLUDE_DIR . 'util/sort.php';
218202

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

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -251,21 +251,13 @@ public function read_post($fieldname)
251251
}
252252

253253

254-
/**
255-
* @deprecated This function will become private in Q2A 1.8. It is specific to this plugin and
256-
* should not be used by outside code.
257-
*/
258-
public function html_to_text($html)
254+
private function html_to_text($html)
259255
{
260256
$viewer = qa_load_module('viewer', '');
261257
return $viewer->get_text($html, 'html', array());
262258
}
263259

264-
/**
265-
* @deprecated This function will become private in Q2A 1.8. It is specific to this plugin and
266-
* should not be used by outside code.
267-
*/
268-
public function bytes_to_mega($bytes)
260+
private function bytes_to_mega($bytes)
269261
{
270262
return $bytes / 1048576;
271263
}

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

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -267,11 +267,7 @@ public function process_request($request)
267267
}
268268

269269

270-
/**
271-
* @deprecated This function will become private in Q2A 1.8. It is specific to this plugin and
272-
* should not be used by outside code.
273-
*/
274-
public function sitemap_output($request, $priority)
270+
private function sitemap_output($request, $priority)
275271
{
276272
echo "\t<url>\n" .
277273
"\t\t<loc>" . qa_xml(qa_path($request, null, qa_opt('site_url'))) . "</loc>\n" .

0 commit comments

Comments
 (0)