Merge branch 'develop' into feature/go-module

wptide · May 12, 2020 · b608630 · b608630
2 parents 8303b76 + 7cf67f7
commit b608630
Show file tree

Hide file tree

Showing 8 changed files with 431 additions and 331 deletions.
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2018 XWP.co (htts://xwp.co)
+Copyright (c) 2018 XWP.co (https://xwp.co)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/README.md b/README.md
@@ -236,7 +236,8 @@ Please read [CONTRIBUTING.md](CONTRIBUTING.md) for details on our code of conduc
 
 ### Contributors
 
-Props: [Bartek Makoś (@MakiBM)](https://github.com/MakiBM),
+Props: [Amit Dudhat (@wpamitkumar)](https://github.com/wpamitkumar),
+[Bartek Makoś (@MakiBM)](https://github.com/MakiBM),
 [Brendan Woods (@brendanwoods-xwp)](https://github.com/brendanwoods-xwp),
 [Cathi Bosco (@cathibosco)](https://github.com/cathibosco),
 [Daniel Louw (@danlouw)](https://github.com/danlouw),

diff --git a/cmd/lighthouse-server/main_test.go b/cmd/lighthouse-server/main_test.go
@@ -311,7 +311,7 @@ func Test_processMessage(t *testing.T) {
 			true,
 		},
 		{
-			"Lighhouse - Success",
+			"Lighthouse - Success",
 			message.Message{
 				Slug: "lhSuccess",
 			},

diff --git a/service/api/composer.json b/service/api/composer.json
@@ -12,7 +12,7 @@
     "ext-grpc": "*",
     "google/cloud": "0.101.1",
     "johnpbloch/wordpress-core-installer": "^1",
-    "johnpbloch/wordpress-core": "4.9.8",
+    "johnpbloch/wordpress-core": "5.3.2",
     "slowprog/composer-copy-file": "0.3.1",
     "wpackagist-theme/twentyseventeen": "1.6",
     "wpackagist-plugin/flush-opcache": "2.4.3",

diff --git a/service/api/composer.lock b/service/api/composer.lock
diff --git a/service/api/wp-content/mu-plugins/advanced-post-cache.php b/service/api/wp-content/mu-plugins/advanced-post-cache.php
@@ -208,7 +208,7 @@ function found_posts_query( $sql ) {
 
 	/**
 	 * If cached: Returns cached result of FOUND_ROWS() query.
-	 * Otherwise: Returs result unchanged
+	 * Otherwise: Returns result unchanged
 	 */
 	function found_posts( $found_posts ) {
 		if ( $this->found_posts && is_array( $this->all_post_ids ) ) // is cached

diff --git a/service/api/wp-content/plugins/wp-tide-api b/service/api/wp-content/plugins/wp-tide-api
diff --git a/service/api/wp-content/plugins/wporg-tide-api b/service/api/wp-content/plugins/wporg-tide-api