Merge remote commits

Changelog.md

@@ -5,6 +5,7 @@
 ## Fixed
  - Added error detection to the code that loads `peppermint.json`.
 
+
 ## v0.12.1-beta1
 
 ### Added
@@ -42,15 +43,18 @@
  - Fixed an issue with the recent changes list not updating when the number of recently changes reached `settings.max_recent_changes` (#104)
  - Fixed changes disappearing from the recent changes page (#106)
 
+
 ## v0.12
 
 (No changes were made between the last beta release and this release)
 
+
 ## v0.12-beta2
 
 ### Changed
  - Changed the revision display text ("Revision created by..." -> "Revision saved by...")
 
+
 ## v0.12-beta1
 
 ### Added
@@ -73,11 +77,13 @@
  - Fixed a bug in the idindex generator.
  - Fixed an issue where you wouldn't be redirected correctly if you typed your password incorrectly
 
+
 ## v0.11
 
 ## Changed
  - Set title of image to alt text
 
+
 ## v0.11-beta2
 
 ### Changed
@@ -87,7 +93,9 @@
  - Polyfill `getallheaders()` if it isn't present
  - Bugfix failed upload message
 
+
 ## v0.11-beta1
+
 ### Added
  - Unlocked the uploading of any file type. Note that only the file types specified in the settings are allowed to be uploaded.
 	- Uploaded video and audio files can now be viewed on their respective pages
@@ -125,6 +133,7 @@
 # Notes
  - Test the etag code!
 
+
 ## v0.10
 
 ### Added
@@ -134,12 +143,14 @@
  - Corrected a minor error in the description of the page viewer module.
  - Corrected a minor spelling mistake in the credits page.
 
+
 ## v0.10-beta2
 
 ## Fixed
  - Added the moderator diamond next to the link to the update page in the credits.
  - Corrected the version numbers of a large number of modules that I forgot to change.
 
+
 ## v0.10-beta1
 
 ### Added

README.md

@@ -137,7 +137,7 @@ Key				| Value			| Explanation
 `search_characters_context` | number | The number of characters that should be displayed either side of a matching term in the context below each search result.
 `search_title_matches_weighting` | number | The weighting to give to search term matches found in a page's title.
 `search_tags_matches_weighting` | number | The weighting to give to search term matches found in a page's tags.
-`css`				| string of css | A string of css to include. Will be included in every page. This may also be a url that references an external stylesheet.
+`css`				| string of css | A string of css to include. Will be included in every page. This may also be an absolute url that references an external stylesheet.
 `favicon`			| url		| A url that points to the favicon for your wiki.
 `session_prefix`	| string	| The prefix that should be used in the names of the session variables. Defaults to an all lower case version of the site name with all non alphanumeric characters removed (The special value `auto` does this). Remember that changing this will log everyone out since the session variable's name will have changed. Normally you won't have to change this - This setting is left over from when we used a cookie to store login details. By default this is set to a safe variant of your site name.
 

settings.fragment.php

@@ -33,6 +33,12 @@ if(!file_exists("peppermint.json"))
 else
 	$settings = json_decode(file_get_contents("peppermint.json"));
 
+if($settings === null)
+{
+	header("content-type: text/plain");
+	exit("Error: Failed to decode the settings file! Does it contain a syntax error?");
+}
+
 if($settings->css === "auto")
 {
 	$settings->css = <<<THEMECSS