resolve merge conflicts

a2hosting · Jul 1, 2024 · f240fe3 · f240fe3
2 parents 88ace9d + f928e53
commit f240fe3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/app/models/admin/class-admin-settings.php b/app/models/admin/class-admin-settings.php
@@ -496,15 +496,15 @@ public function get_opt_performance() {
 				'color_class' => 'warn'
 			],
 			'a2hosting-other' => [
-				'display_text' => 'Managed Wordpress',
+				'display_text' => 'Managed WordPress',
 				'metric_text' => '',
 				'explanation' => '',
 				'color_class' => 'success'
 			],
 			'webperformance' => [
 				'display_text' => 'Web Performance',
 				'metric_text' => "How does your hosting <strong>compare</strong> to A2 Hosting's best plans? With the graphs below <strong>LOWER IS BETTER</strong>.",
-				'legend_text' => 'Overall Wordpress Execution Time',
+				'legend_text' => "Overall WordPress Execution Time",
 				'explanation' => 'The web performance score measures how your current host performs compared to A2 Hosting. This web performance score looks at server speed and other metrics to determine how fast your website will load, based on which hosting company & plan you host your website with. <br /><br />
 				The lower the score on the graph the faster your website will load. Not all hosting companies and plans use the same hardware. A2 Hosting uses the best server hardware on the market, focusing on speed & security. A2 Hosting also offers free site migration to help you move your existing websites to them.<br /><br />
 				Graphs are representitive of the following, and individual results may vary based on current server load, PHP version, WordPress version, etc.<br />
@@ -546,7 +546,7 @@ public function get_opt_performance() {
 				],
 			],
 			'hostingmatchup_tooltips' => [
-				'wordpress_db' => 'Wordpress Database Response Time',
+				'wordpress_db' => 'WordPress Database Response Time',
 				'filesystem' => 'Server Disk Response Time',
 				'mysql' => 'MYSQL Query Response Time',
 				'php' => 'PHP Response Time'

diff --git a/core/A2_Optimized_Optimizations.php b/core/A2_Optimized_Optimizations.php
@@ -869,13 +869,13 @@ public function get_best_practices() {
 			],
 			'themes' => [
 				'title' => 'Unused Themes',
-				'description' => 'Unused, non-default themes should be deleted.  For more information read the Wordpress.org Codex on <a target="_blank" href="http://codex.wordpress.org/WordPress_Housekeeping#Theme_Housekeeping">WordPress Housekeeping</a>',
+				'description' => 'Unused, non-default themes should be deleted.  For more information read the WordPress.org Codex on <a target="_blank" href="http://codex.wordpress.org/WordPress_Housekeeping#Theme_Housekeeping">WordPress Housekeeping</a>',
 				'config_url' => admin_url() . 'themes.php',
 				'status' => $this->is_active('themes', false),
 			],
 			'plugins' => [
 				'title' => 'Inactive Plugins',
-				'description' => 'Unused, inactive plugins should be deleted. WordPress will still check for updates on each plugin even if it is not active, which could slow down your site. For more information read the Wordpress.org Codex on <a target="_blank" href="http://codex.wordpress.org/WordPress_Housekeeping">WordPress Housekeeping</a>',
+				'description' => 'Unused, inactive plugins should be deleted. WordPress will still check for updates on each plugin even if it is not active, which could slow down your site. For more information read the WordPress.org Codex on <a target="_blank" href="http://codex.wordpress.org/WordPress_Housekeeping">WordPress Housekeeping</a>',
 				'config_url' => admin_url() . 'plugins.php',
 				'status' => $this->is_active('plugins', false),
 			],