Replaced number_format in plugins

qa-include/plugins/qa-widget-activity-count.php

@@ -49,12 +49,14 @@ class qa_activity_count
 
 	public function output_count($themeobject, $value, $langsingular, $langplural)
 	{
+		require_once QA_INCLUDE_DIR . 'app/format.php';
+
 		$themeobject->output('<p class="qa-activity-count-item">');
 
 		if ($value==1)
 			$themeobject->output(qa_lang_html_sub($langsingular, '<span class="qa-activity-count-data">1</span>', '1'));
 		else
-			$themeobject->output(qa_lang_html_sub($langplural, '<span class="qa-activity-count-data">'.number_format((int)$value).'</span>'));
+			$themeobject->output(qa_lang_html_sub($langplural, '<span class="qa-activity-count-data">'.qa_format_number((int)$value).'</span>'));
 
 		$themeobject->output('</p>');
 	}

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

@@ -79,9 +79,9 @@ class qa_wysiwyg_editor
 				array(
 					'id' => 'wysiwyg_editor_upload_max_size_display',
 					'label' => 'Maximum size of uploads:',
-					'suffix' => 'MB (max '.$this->bytes_to_mega_html(qa_get_max_upload_size()).')',
+					'suffix' => 'MB (max '.qa_html(qa_format_number($this->bytes_to_mega(qa_get_max_upload_size()))).')',
 					'type' => 'number',
-					'value' => $this->bytes_to_mega_html(qa_opt('wysiwyg_editor_upload_max_size')),
+					'value' => qa_html(number_format($this->bytes_to_mega(qa_opt('wysiwyg_editor_upload_max_size')))),
 					'tags' => 'name="wysiwyg_editor_upload_max_size_field"',
 				),
 			),
@@ -215,16 +215,12 @@ class qa_wysiwyg_editor
 				);
 			}
 			else {
-				// convert to text
-				$viewer = qa_load_module('viewer', '');
-
 				return array(
 					'format' => '',
 					'content' => $this->html_to_text($html),
 				);
 			}
-		}
-		else {
+		} else {
 			// CKEditor was not loaded so treat it as plain text
 			return array(
 				'format' => '',
@@ -248,8 +244,8 @@ 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 bytes_to_mega_html($bytes)
+	public function bytes_to_mega($bytes)
 	{
-		return qa_html(number_format($bytes/1048576, 1));
+		return $bytes / 1048576;
 	}
 }