Merge pull request #1706 from TehMuffinMoo/v2-develop

V2 develop

api/config/default.php

@@ -583,4 +583,4 @@ return [
 	'defaultSettingsTab' => '5',
 	'blacklisted' => '',
 	'blacklistedMessage' => 'You have been blacklisted from this site.'
-];
+];

api/functions/option-functions.php

@@ -899,27 +899,35 @@ trait OptionsFunction
 	
 	public function timeFormatOptions()
 	{
-		return array(
-			array(
-				'name' => '6p',
-				'value' => 'h(:mm)t'
-			),
-			array(
-				'name' => '6:00p',
-				'value' => 'h:mmt'
-			),
-			array(
-				'name' => '6:00',
-				'value' => 'h:mm'
-			),
-			array(
-				'name' => '18',
-				'value' => 'H(:mm)'
-			),
-			array(
-				'name' => '18:00',
-				'value' => 'H:mm'
-			)
+                return array(
+                        array(
+                                'name' => '6p',
+                                'value' => 'h(:mm)t'
+                        ),
+                        array(
+                                'name' => '6:00p',
+                                'value' => 'h:mmt'
+                        ),
+                        array(
+                                'name' => '6pm',
+                                'value' => 'h(:mm)a'
+                        ),
+                        array(
+                                'name' => '6:00pm',
+                                'value' => 'h:mma'
+                        ),
+                        array(
+                                'name' => '6:00',
+                                'value' => 'h:mm'
+                        ),
+                        array(
+                                'name' => '18',
+                                'value' => 'H(:mm)'
+                        ),
+                        array(
+                                'name' => '18:00',
+                                'value' => 'H:mm'
+                        )
 		);
 	}
 	
@@ -1078,4 +1086,4 @@ trait OptionsFunction
 			)
 		);
 	}
-}
+}