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, 47 insertions, 43 deletions

diff --git a/mod/categories/views/default/categories.php b/mod/categories/views/default/categories.php
index f5a41cfa1..98e87a05f 100644
--- a/mod/categories/views/default/categories.php
+++ b/mod/categories/views/default/categories.php
@@ -1,48 +1,52 @@
 <?php
 
-	/**
-	 * Elgg categories plugin
-	 * 
-	 * @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/
-	 */
-
-		if (isset($vars['entity']) && $vars['entity'] instanceof ElggEntity) {
-			$selected_categories = $vars['entity']->universal_categories;
-		}
-		$categories = $vars['config']->site->categories;
-		if (empty($categories)) $categories = array();
-		if (empty($selected_categories)) $selected_categories = array(); 
-
-		if (!empty($categories)) {
-			if (!is_array($categories)) $categories = array($categories);
-		
-?>
-
-		<div id="content_area_user_title"><h2 class="categoriestitle"><?php echo elgg_echo('categories'); ?></h2></div>
-		<div class="categories">
-			<p>
-			
-<?php
+/**
+ * Elgg categories plugin
+ *
+ * @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/
+ */
+
+if (isset($vars['entity']) && $vars['entity'] instanceof ElggEntity) {
+	$selected_categories = $vars['entity']->universal_categories;
+}
+$categories = $vars['config']->site->categories;
+if (empty($categories)) {
+	$categories = array();
+}
+if (empty($selected_categories)) {
+	$selected_categories = array();
+}
+
+if (!empty($categories)) {
+	if (!is_array($categories)) {
+		$categories = array($categories);
+	}
 
-		echo elgg_view('input/checkboxes',array(
-			'options' => $categories,
-			'value' => $selected_categories,
-			'internalname' => 'universal_categories_list'
-												));
-
-?>
-			<input type="hidden" name="universal_category_marker" value="on" />
-			</p>
-		</div>
-		
-<?php
+	?>
 
-	} else {
-		echo '<input type="hidden" name="universal_category_marker" value="on" />';
-	}
+<div id="content_area_user_title"><h2 class="categoriestitle"><?php echo elgg_echo('categories'); ?></h2></div>
+<div class="categories">
+	<p>
+
+			<?php
+
+			echo elgg_view('input/checkboxes',array(
+				'options' => $categories,
+				'value' => $selected_categories,
+				'internalname' => 'universal_categories_list'
+				));
+
+			?>
+		<input type="hidden" name="universal_category_marker" value="on" />
+	</p>
+</div>
+
+	<?php
 
-?>
\ No newline at end of file
+} else {
+	echo '<input type="hidden" name="universal_category_marker" value="on" />';
+}