Merge branch 'release/2013-09.08'

Schlaefer · Oct 9, 2013 · a5a19ea · a5a19ea
2 parents d3b9774 + 203995d
commit a5a19ea
Show file tree

Hide file tree

Showing 28 changed files with 1,725 additions and 151 deletions.
diff --git a/app/Config/bootstrap.php b/app/Config/bootstrap.php
@@ -117,7 +117,8 @@
 
 CakePlugin::loadAll(
 	[
-		'Api' => ['bootstrap' => true, 'routes' => true]
+		'Api' => ['bootstrap' => true, 'routes' => true],
+		'M'   => ['bootstrap' => true, 'routes' => true]
 	]
 );
 

diff --git a/app/Config/version.php b/app/Config/version.php
@@ -1,2 +1,2 @@
 <?php
-	Configure::write('Saito.v', '2013-09.07');
+	Configure::write('Saito.v', '2013-10.01');
diff --git a/app/Controller/SettingsController.php b/app/Controller/SettingsController.php
@@ -13,51 +13,53 @@ class SettingsController extends AppController {
 		/**
 		 * Subset of MLF settings currently used by Saito
 		 */
-		protected $_currentlyUsedSettings = array(
-				'autolink'											 => 1,
-				'bbcode_img'										 => 1,
-				'block_user_ui'									 => 1,
-				/**
-				 * Activates and deactivates the category-chooser on entries/index
-				 */
-				'category_chooser_global'				 => 1,
-				/**
-				 * Allows users to show the category-chooser even if the default
-				 * setting `category_chooser_global` is off
-				 */
-				'category_chooser_user_override' => 1,
-				'edit_delay'										 => 1,
-				'edit_period'										 => 1,
-				'embedly_enabled'								 => 1,
-				'embedly_key'										 => 1,
-				'flattr_enabled'								 => 1,
-				'flattr_language'								 => 1,
-				'flattr_category'								 => 1,
-				'forum_disabled'								 => 1,
-				'forum_disabled_text'						 => 1,
-				'forum_email'										 => 1,
-				'forum_name'										 => 1,
-				'quote_symbol'									 => 1,
-				'shoutbox_enabled'							 => 1,
-				'shoutbox_max_shouts'						 => 1,
-				'signature_separator'						 => 1,
-				'smilies'												 => 1,
-				'stopwatch_get'									 => 1,
-				'store_ip'											 => 1,
-				'store_ip_anonymized'						 => 1,
-				'subject_maxlength'							 => 1,
-				'tos_enabled'										 => 1,
-				'tos_url'												 => 1,
-				'text_word_maxlength'						 => 1,
-				'thread_depth_indent'						 => 1,
-				'timezone'											 => 1,
-				'topics_per_page'								 => 1,
-				'upload_max_img_size'						 => 1,
-				'upload_max_number_of_uploads'	 => 1,
-				'userranks_ranks'								 => 1,
-				'userranks_show'								 => 1,
-				'video_domains_allowed'					 => 1,
-		);
+		protected $_currentlyUsedSettings = [
+			'autolink'                       => 1,
+			'api_enabled'                    => 1,
+			'api_crossdomain'                => 1,
+			'bbcode_img'                     => 1,
+			'block_user_ui'                  => 1,
+			/**
+			 * Activates and deactivates the category-chooser on entries/index
+			 */
+			'category_chooser_global'        => 1,
+			/**
+			 * Allows users to show the category-chooser even if the default
+			 * setting `category_chooser_global` is off
+			 */
+			'category_chooser_user_override' => 1,
+			'edit_delay'                     => 1,
+			'edit_period'                    => 1,
+			'embedly_enabled'                => 1,
+			'embedly_key'                    => 1,
+			'flattr_enabled'                 => 1,
+			'flattr_language'                => 1,
+			'flattr_category'                => 1,
+			'forum_disabled'                 => 1,
+			'forum_disabled_text'            => 1,
+			'forum_email'                    => 1,
+			'forum_name'                     => 1,
+			'quote_symbol'                   => 1,
+			'shoutbox_enabled'               => 1,
+			'shoutbox_max_shouts'            => 1,
+			'signature_separator'            => 1,
+			'smilies'                        => 1,
+			'stopwatch_get'                  => 1,
+			'store_ip'                       => 1,
+			'store_ip_anonymized'            => 1,
+			'subject_maxlength'              => 1,
+			'tos_enabled'                    => 1,
+			'tos_url'                        => 1,
+			'text_word_maxlength'            => 1,
+			'thread_depth_indent'            => 1,
+			'timezone'                       => 1,
+			'topics_per_page'                => 1,
+			'upload_max_img_size'            => 1,
+			'upload_max_number_of_uploads'   => 1,
+			'userranks_ranks'                => 1,
+			'userranks_show'                 => 1,
+			'video_domains_allowed'          => 1
+		];
 
 		public function admin_index() {
 			$settings = $this->request->data = $this->Setting->getSettings();