Merged [5623]:head from 1.7 to trunk.

git-svn-id: http://code.elgg.org/elgg/trunk@5760 36083f99-b078-4883-b0ff-0f9b5a30f544

1 files changed, 33 insertions, 41 deletions

diff --git a/mod/categories/settings.php b/mod/categories/settings.php
index 85696730a..260b057c3 100644
--- a/mod/categories/settings.php
+++ b/mod/categories/settings.php
@@ -1,43 +1,35 @@
 <?php
 
-	/**
-	 * Elgg categories plugin settings page
-	 * 
-	 * @package ElggCategories
-	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
-	 * @author Curverider Ltd <info@elgg.com>
-	 * @copyright Curverider Ltd 2008-2010
-	 * @link http://elgg.com/
-	 */
-
-	// Load engine and restrict to admins 
-
-		require_once(dirname(dirname(dirname(__FILE__))) . '/engine/start.php');
-		admin_gatekeeper();
-		
-	// Set context
-	
-		set_context('admin');
-		
-	// Get site and categories
-		
-		global $CONFIG;
-		$site = $CONFIG->site;
-		$categories = $site->categories;
-		
-		if (empty($categories)) $categories = array();
-		
-	// Load category save view
-	
-		$body = elgg_view('categories/settings',array(
-							'categories' => $categories,
-						));
-
-	// Layout
-
-		$body = elgg_view_layout('two_column_left_sidebar','', $body);
-						
-	// View page
-		page_draw(elgg_echo('categories:settings'),$body);
-		
-?>
\ No newline at end of file
+/**
+ * Elgg categories plugin settings page
+ *
+ * @package ElggCategories
+ * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+ * @author Curverider Ltd <info@elgg.com>
+ * @copyright Curverider Ltd 2008-2010
+ * @link http://elgg.com/
+ */
+
+// Load engine and restrict to admins 
+require_once(dirname(dirname(dirname(__FILE__))) . '/engine/start.php');
+admin_gatekeeper();
+
+// Set context
+set_context('admin');
+
+// Get site and categories
+global $CONFIG;
+$site = $CONFIG->site;
+$categories = $site->categories;
+
+if (empty($categories)) {
+	$categories = array();
+}
+
+// Load category save view
+$body = elgg_view('categories/settings',array('categories' => $categories));
+
+
+$body = elgg_view_layout('two_column_left_sidebar', '', $body);
+
+page_draw(elgg_echo('categories:settings'), $body);