Merge branch '1.7.x'

.github/workflows/phpstan.yml

@@ -4,6 +4,7 @@ on:
   push:
     paths:
       - '**.php'
+      - '**.yml'
 
 jobs:
   phpstan:

.gitmodules

@@ -7,3 +7,21 @@
 [submodule "wp-content/plugins/cac-network-info"]
 	path = wp-content/plugins/cac-network-info
 	url = [email protected]:cuny-academic-commons/cac-network-info
+[submodule "wp-content/plugins/webwork-problem-embed"]
+	path = wp-content/plugins/webwork-problem-embed
+	url = [email protected]:openlab-at-city-tech/webwork-problem-embed
+[submodule "wp-content/plugins/openlab-activity-block"]
+	path = wp-content/plugins/openlab-activity-block
+	url = [email protected]:openlab-at-city-tech/openlab-activity-block
+[submodule "wp-content/plugins/openlab-email-embedded-media"]
+	path = wp-content/plugins/openlab-email-embedded-media
+	url = [email protected]:openlab-at-city-tech/openlab-email-embedded-media
+[submodule "wp-content/plugins/openlab-rich-text-comments"]
+	path = wp-content/plugins/openlab-rich-text-comments
+	url = [email protected]:openlab-at-city-tech/openlab-rich-text-comments
+[submodule "wp-content/plugins/openlab-modules"]
+	path = wp-content/plugins/openlab-modules
+	url = [email protected]:openlab-at-city-tech/openlab-modules
+[submodule "wp-content/plugins/openlab-connections"]
+	path = wp-content/plugins/openlab-connections
+	url = [email protected]:openlab-at-city-tech/openlab-connections

license.txt

@@ -1,6 +1,6 @@
 WordPress - Web publishing software
 
-Copyright 2011-2022 by the contributors
+Copyright 2011-2023 by the contributors
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by

phpstan.neon

@@ -24,8 +24,10 @@ parameters:
     - wp-content/plugins/gravityperks
     - wp-content/plugins/invite-anyone
     - wp-content/plugins/openlab-badges
+    - wp-content/plugins/openlab-connections
     - wp-content/plugins/openlab-favorites
     - wp-content/plugins/papercite
+    - wp-content/plugins/reckoning
     - wp-content/themes/genesis
   ignoreErrors:
     - # Template files have some variables included in parent scope.

readme.html

@@ -47,7 +47,7 @@ <h3>Updating Manually</h3>
 </ol>
 
 <h2>Migrating from other systems</h2>
-<p>WordPress can <a href="https://wordpress.org/support/article/importing-content/">import from a number of systems</a>. First you need to get WordPress installed and working as described above, before using <a href="wp-admin/import.php">our import tools</a>.</p>
+<p>WordPress can <a href="https://wordpress.org/documentation/article/importing-content/">import from a number of systems</a>. First you need to get WordPress installed and working as described above, before using <a href="wp-admin/import.php">our import tools</a>.</p>
 
 <h2>System Requirements</h2>
 <ul>
@@ -67,7 +67,7 @@ <h3>Recommendations</h3>
 <h2>Online Resources</h2>
 <p>If you have any questions that are not addressed in this document, please take advantage of WordPress&#8217; numerous online resources:</p>
 <dl>
-	<dt><a href="https://wordpress.org/support/">HelpHub</a></dt>
+	<dt><a href="https://wordpress.org/documentation/">HelpHub</a></dt>
 		<dd>HelpHub is the encyclopedia of all things WordPress. It is the most comprehensive source of information for WordPress available.</dd>
 	<dt><a href="https://wordpress.org/news/">The WordPress Blog</a></dt>
 		<dd>This is where you&#8217;ll find the latest updates and news related to WordPress. Recent WordPress news appears in your administrative dashboard by default.</dd>
@@ -88,7 +88,7 @@ <h2>Final Notes</h2>
 <h2>Share the Love</h2>
 <p>WordPress has no multi-million dollar marketing campaign or celebrity sponsors, but we do have something even better&#8212;you. If you enjoy WordPress please consider telling a friend, setting it up for someone less knowledgeable than yourself, or writing the author of a media article that overlooks us.</p>
 
-<p>WordPress is the official continuation of <a href="http://cafelog.com/">b2/caf&#233;log</a>, which came from Michel V. The work has been continued by the <a href="https://wordpress.org/about/">WordPress developers</a>. If you would like to support WordPress, please consider <a href="https://wordpress.org/donate/">donating</a>.</p>
+<p>WordPress is the official continuation of <a href="https://cafelog.com/">b2/caf&#233;log</a>, which came from Michel V. The work has been continued by the <a href="https://wordpress.org/about/">WordPress developers</a>. If you would like to support WordPress, please consider <a href="https://wordpress.org/donate/">donating</a>.</p>
 
 <h2>License</h2>
 <p>WordPress is free software, and is released under the terms of the <abbr>GPL</abbr> (GNU General Public License) version 2 or (at your option) any later version. See <a href="license.txt">license.txt</a>.</p>