Merge ff437562e3 into 16354b467e

With the recent changes module, adding a recent change for a new comment
caused the warning "Undefined variable $comment_thread" if the comment
was not a reply. Use `isset()` instead of `!== NULL` to check for reply
depth, avoiding the warning when $comment_thread is not set.

CONTRIBUTING.md

@@ -1,7 +1,7 @@
 # Contributors guide
 Contributions are very welcome - both issues and pull requests! Please mention in your pull request that you release your work under the MPL-2.0 (see below).
 
-While Pepperminty Wiki is a huge long-time passion of mine, at times it may take up to 2 weeks at times for me to respond to issues and pull requests. If it has been a few days and you have not received a reply, consider joining [the Gitter/Matrix chat](https://app.gitter.im/#/room/#Pepperminty-Wiki_Lobby:gitter.im) and poking me on there.
+While Pepperminty Wiki is a huge long-time passion of mine, due to life stuff at times it may take up to 2 weeks at times for me to respond to issues and pull requests. If it has been a few days and you have not received a reply, consider joining [the Gitter/Matrix chat](https://app.gitter.im/#/room/#Pepperminty-Wiki_Lobby:gitter.im) and poking me on there.
 
 I recommend checking on your pull request or issue every few days for a reply.
 

Changelog.md

@@ -6,8 +6,10 @@ This file holds the changelog for Pepperminty Wiki. This is the master list of t
 This is the next release of Pepperminty Wiki, that hasn't been released yet.
 
 - **Fixed:** Fixed link to the interwiki links documentation on the help page if interwiki links have not yet been setup.
+- **Fixed:** Fixed typos in system text
 - **Changed:** Catch and deal with more unpacking issues on first run (thanks, @daveschroeter in [#249](https://github.com/sbrl/Pepperminty-Wiki/issues/249))
 
+
 ## v0.24
  - **Added:** `filter` GET parameter to the `list` action, which filters the list of pages to contain only those containing the specified substring.
  - **Fixed:** [Rest API] Documented `redirect` and `redirected_from` GET params to the `view` action.

modules/feature-comments.php

@@ -134,7 +134,7 @@ register_module([
 					"timestamp" => time(),
 					"page" => $env->page,
 					"user" => $env->user,
-					"reply_depth" => $comment_thread !== null ? count($comment_thread) : 0,
+					"reply_depth" => isset($comment_thread) ? count($comment_thread) : 0,
 					"comment_id" => $new_comment->id
 				]);
 			}

modules/page-edit.php

@@ -1,11 +1,11 @@
-<?php
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+<?php
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
 register_module([
 	"name" => "Page editor",
-	"version" => "0.19",
+	"version" => "0.19.1",
 	"author" => "Starbeamrainbowlabs",
 	"description" => "Allows you to edit pages by adding the edit and save actions. You should probably include this one.",
 	"id" => "page-edit",
@@ -88,7 +88,7 @@ register_module([
 						$sourceViewContent = "<p>$settings->sitename currently has editing disabled, so you can't make changes to this page at this time. Please contact ".htmlentities($settings->admindetails_name).", $settings->sitename's administrator for more information - their contact details can be found at the bottom of this page. Even so, you can still view the source of this page. It's disabled below:</p>";
 					
 					if($isOtherUsersPage)
-						$sourceViewContent = "<p>$env->page_safe is a special user page which acutally belongs to " . htmlentities(extract_user_from_userpage($env->page)) . ", another user on $settings->sitename. Because of this, you are not allowed to edit it (though you can always edit your own page and any pages under it if you're logged in). You can, however, vieww it's source below.</p>";
+						$sourceViewContent = "<p>$env->page_safe is a special user page which actually belongs to " . htmlentities(extract_user_from_userpage($env->page)) . ", another user on $settings->sitename. Because of this, you are not allowed to edit it (though you can always edit your own page and any pages under it if you're logged in). You can, however, view it's source below.</p>";
 					
 					// Append a view of the page's source
 					$sourceViewContent .= "<textarea name='content' readonly>".htmlentities($pagetext)."</textarea>";