diff options
| author | Sem <sembrestels@riseup.net> | 2011-11-18 07:32:27 +0100 |
|---|---|---|
| committer | Sem <sembrestels@riseup.net> | 2011-11-18 07:32:27 +0100 |
| commit | e53d410129701ea1c9d19529afa493f11b5f5b70 (patch) | |
| tree | d9963b24bf8932654b4a47e36602c75975e50dba /mod/categories | |
| parent | 377da25d2965c64941f83baae119fc970ec60982 (diff) | |
| parent | 08a962c98e2923724f8013d6eaae89101243752a (diff) | |
| download | elgg-e53d410129701ea1c9d19529afa493f11b5f5b70.tar.gz elgg-e53d410129701ea1c9d19529afa493f11b5f5b70.tar.bz2 | |
Merge github.com:Elgg/Elgg
Conflicts:
engine/lib/input.php
Diffstat (limited to 'mod/categories')
| -rw-r--r-- | mod/categories/deactivate.php | 6 | ||||
| -rw-r--r-- | mod/categories/manifest.xml | 7 | ||||
| -rw-r--r-- | mod/categories/pages/categories/listing.php (renamed from mod/categories/listing.php) | 7 | ||||
| -rw-r--r-- | mod/categories/start.php | 8 |
4 files changed, 19 insertions, 9 deletions
diff --git a/mod/categories/deactivate.php b/mod/categories/deactivate.php new file mode 100644 index 000000000..e15e2c6e9 --- /dev/null +++ b/mod/categories/deactivate.php @@ -0,0 +1,6 @@ +<?php +/** + * Remove admin notice to populate categories. + */ + +elgg_delete_admin_notice('categories_admin_notice_no_categories'); diff --git a/mod/categories/manifest.xml b/mod/categories/manifest.xml index 15d7192c1..4a6bd0864 100644 --- a/mod/categories/manifest.xml +++ b/mod/categories/manifest.xml @@ -9,10 +9,9 @@ <description>Site-wide Categories lets administrators define categories that users across the site can add content to.</description> <website>http://www.elgg.org/</website> <copyright>See COPYRIGHT.txt</copyright> - <license>GNU Public License version 2</license> + <license>GNU General Public License version 2</license> <requires> - <type>elgg_version</type> - <version>2010030101</version> + <type>elgg_release</type> + <version>1.8</version> </requires> - <admin_interface>advanced</admin_interface> </plugin_manifest> diff --git a/mod/categories/listing.php b/mod/categories/pages/categories/listing.php index abbcf6785..8924506e9 100644 --- a/mod/categories/listing.php +++ b/mod/categories/pages/categories/listing.php @@ -29,6 +29,11 @@ $title = elgg_echo('categories:results', array($category)); $content = elgg_view_title($title); $content .= $objects; -$body = elgg_view_layout('two_column_left_sidebar', '', $content); +$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..0aacf11e7 100644 --- a/mod/categories/start.php +++ b/mod/categories/start.php @@ -27,12 +27,12 @@ function categories_init() { /** - * Page handler - * + * Category page handler + * @return bool */ function categories_page_handler() { - include(dirname(__FILE__) . "/listing.php"); - return TRUE; + include(dirname(__FILE__) . "/pages/categories/listing.php"); + return true; } /** |