From 2716a9e86a94cedbb4a7cfcfd89579fbd6be0ae5 Mon Sep 17 00:00:00 2001
From: Starbeamrainbowlabs <sbrl@starbeamrainbowlabs.com>
Date: Mon, 13 Jun 2016 06:41:50 +0100
Subject: [PATCH] Correct syntax error that broke travis CI

---
 build/index.php       | 30 ++++++++++++++++++------------
 module_index.json     |  2 +-
 settings.fragment.php |  2 +-
 3 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/build/index.php b/build/index.php
index 7c7598d..23b6e31 100644
--- a/build/index.php
+++ b/build/index.php
@@ -27,7 +27,7 @@ if(!file_exists("peppermint.json"))
 {
 	// Copy the default settings over to the main settings array
 	foreach ($guiConfig as $key => $value)
-		$settings->$key = $value->default
+		$settings->$key = $value->default;
 	// Generate a random secret
 	$settings->secret = bin2hex(openssl_random_pseudo_bytes($bits));
 	file_put_contents("peppermint.json", json_encode($settings, JSON_PRETTY_PRINT));
@@ -2400,18 +2400,24 @@ register_module([
 		 * @api {get} ?action=upload Get a page to let you upload a file.
 		 * @apiName UploadFilePage
 		 * @apiGroup Upload
-	 */
+		*/
 		
- 		/**
- 		 * @api {post} ?action=upload Upload a file
- 		 * @apiName UploadFile
- 		 * @apiGroup Upload
- 		 * @apiPermission User
- 		 *
- 		 * @apiParam {file} file		The file to upload.
- 		 *
- 		 * @apiUse UserNotLoggedInError
- 		 */
+		/**
+		 * @api {post} ?action=upload Upload a file
+		 * @apiName UploadFile
+		 * @apiGroup Upload
+		 * @apiPermission User
+		 *
+		 * @apiParam {file} file		The file to upload.
+		 *
+		 * @apiUse	UserNotLoggedInError
+		 * @apiError	UploadsDisabledError	Uploads are currently disabled in the wiki's settings.
+		 * @apiError	UnknownFileTypeError	The type of the file you uploaded is not currently allowed in the wiki's settings.
+		 * @apiError	ImageDimensionsFiledError	PeppermintyWiki couldn't obtain the dimensions of the image you uploaded.
+		 * @apiError	DangerousFileError		The file uploaded appears to be dangerous.
+		 * @apiError	DuplicateFileError		The filename specified is a duplicate of a file that already exists.
+		 * @apiError	FileTamperedError		Pepperminty Wiki couldn't verify that the file wasn't tampered with during theupload process.
+		 */
 		
 		/*
 		 * ██    ██ ██████  ██       ██████   █████  ██████  
diff --git a/module_index.json b/module_index.json
index c8a21d4..6dc9be4 100644
--- a/module_index.json
+++ b/module_index.json
@@ -77,7 +77,7 @@
         "author": "Starbeamrainbowlabs",
         "description": "Adds the ability to upload files to Pepperminty Wiki. Uploaded files act as pages and have the special 'File\/' prefix.",
         "id": "feature-upload",
-        "lastupdate": 1465761247,
+        "lastupdate": 1465761892,
         "optional": false
     },
     {
diff --git a/settings.fragment.php b/settings.fragment.php
index 8f7e8ae..30abbfe 100644
--- a/settings.fragment.php
+++ b/settings.fragment.php
@@ -24,7 +24,7 @@ if(!file_exists("peppermint.json"))
 {
 	// Copy the default settings over to the main settings array
 	foreach ($guiConfig as $key => $value)
-		$settings->$key = $value->default
+		$settings->$key = $value->default;
 	// Generate a random secret
 	$settings->secret = bin2hex(openssl_random_pseudo_bytes($bits));
 	file_put_contents("peppermint.json", json_encode($settings, JSON_PRETTY_PRINT));