From a11aec8c7b88e78581a5550c059c2cfab099a02d Mon Sep 17 00:00:00 2001
From: Brett Profitt <brett.profitt@gmail.com>
Date: Thu, 13 Oct 2011 19:02:39 -0700
Subject: Fixes #3746. Moved the categories page handler script. Updated the
 layout call.

---
 mod/categories/listing.php                  | 34 -------------------------
 mod/categories/pages/categories/listing.php | 39 +++++++++++++++++++++++++++++
 mod/categories/start.php                    |  2 +-
 3 files changed, 40 insertions(+), 35 deletions(-)
 delete mode 100644 mod/categories/listing.php
 create mode 100644 mod/categories/pages/categories/listing.php

(limited to 'mod/categories')

diff --git a/mod/categories/listing.php b/mod/categories/listing.php
deleted file mode 100644
index abbcf6785..000000000
--- a/mod/categories/listing.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-/**
- * List entities by category
- *
- * @package ElggCategories
- */
-
-$limit = get_input("limit", 10);
-$offset = get_input("offset", 0);
-$category = get_input("category");
-$owner_guid = get_input("owner_guid", ELGG_ENTITIES_ANY_VALUE);
-$subtype = get_input("subtype", ELGG_ENTITIES_ANY_VALUE);
-$type = get_input("type", 'object');
-
-$params = array(
-	'metadata_name' => 'universal_categories',
-	'metadata_value' => $category,
-	'types' => $type,
-	'subtypes' => $subtype,
-	'owner_guid' => $owner_guid,
-	'limit' => $limit,
-	'full_view' => FALSE,
-	'metadata_case_sensitive' => FALSE,
-);
-$objects = elgg_list_entities_from_metadata($params);
-
-$title = elgg_echo('categories:results', array($category));
-
-$content = elgg_view_title($title);
-$content .= $objects;
-
-$body = elgg_view_layout('two_column_left_sidebar', '', $content);
-
-echo elgg_view_page($title, $body);
diff --git a/mod/categories/pages/categories/listing.php b/mod/categories/pages/categories/listing.php
new file mode 100644
index 000000000..8924506e9
--- /dev/null
+++ b/mod/categories/pages/categories/listing.php
@@ -0,0 +1,39 @@
+<?php
+/**
+ * List entities by category
+ *
+ * @package ElggCategories
+ */
+
+$limit = get_input("limit", 10);
+$offset = get_input("offset", 0);
+$category = get_input("category");
+$owner_guid = get_input("owner_guid", ELGG_ENTITIES_ANY_VALUE);
+$subtype = get_input("subtype", ELGG_ENTITIES_ANY_VALUE);
+$type = get_input("type", 'object');
+
+$params = array(
+	'metadata_name' => 'universal_categories',
+	'metadata_value' => $category,
+	'types' => $type,
+	'subtypes' => $subtype,
+	'owner_guid' => $owner_guid,
+	'limit' => $limit,
+	'full_view' => FALSE,
+	'metadata_case_sensitive' => FALSE,
+);
+$objects = elgg_list_entities_from_metadata($params);
+
+$title = elgg_echo('categories:results', array($category));
+
+$content = elgg_view_title($title);
+$content .= $objects;
+
+$body = elgg_view_layout('content', array(
+	'content' => $content,
+	'title' => $title,
+	'filter' => '',
+	'header' => '',
+));
+
+echo elgg_view_page($title, $body);
diff --git a/mod/categories/start.php b/mod/categories/start.php
index 2ccea0d70..b6bc4a55c 100644
--- a/mod/categories/start.php
+++ b/mod/categories/start.php
@@ -31,7 +31,7 @@ function categories_init() {
  *
  */
 function categories_page_handler() {
-	include(dirname(__FILE__) . "/listing.php");
+	include(dirname(__FILE__) . "/pages/categories/listing.php");
 	return TRUE;
 }
 
-- 
cgit v1.2.3