From 3703a53134d6b167602cd40f31eb58bfefda9d0b Mon Sep 17 00:00:00 2001
From: cash <cash.costello@gmail.com>
Date: Mon, 24 Oct 2011 22:01:03 -0400
Subject: Fixes #3974 blog, bookmarks, file, and pages plugins consistent in
 integration with categories plugin

---
 mod/blog/views/default/forms/blog/save.php       | 2 +-
 mod/blog/views/default/object/blog.php           | 3 +--
 mod/bookmarks/views/default/object/bookmarks.php | 2 +-
 mod/file/views/default/object/file.php           | 2 +-
 mod/pages/views/default/forms/pages/edit.php     | 2 +-
 mod/pages/views/default/object/page_top.php      | 3 ++-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/mod/blog/views/default/forms/blog/save.php b/mod/blog/views/default/forms/blog/save.php
index 8246fdec3..a805541bd 100644
--- a/mod/blog/views/default/forms/blog/save.php
+++ b/mod/blog/views/default/forms/blog/save.php
@@ -104,7 +104,7 @@ $access_input = elgg_view('input/access', array(
 	'value' => $vars['access_id']
 ));
 
-$categories_input = elgg_view('categories', $vars);
+$categories_input = elgg_view('input/categories', $vars);
 
 // hidden inputs
 $container_guid_input = elgg_view('input/hidden', array('name' => 'container_guid', 'value' => elgg_get_page_owner_guid()));
diff --git a/mod/blog/views/default/object/blog.php b/mod/blog/views/default/object/blog.php
index ab75bd09b..b51b769a2 100644
--- a/mod/blog/views/default/object/blog.php
+++ b/mod/blog/views/default/object/blog.php
@@ -52,8 +52,7 @@ $metadata = elgg_view_menu('entity', array(
 	'class' => 'elgg-menu-hz',
 ));
 
-$subtitle = "<p>$author_text $date $comments_link</p>";
-$subtitle .= $categories;
+$subtitle = "$author_text $date $comments_link $categories";
 
 // do not show the metadata and controls in widget view
 if (elgg_in_context('widgets')) {
diff --git a/mod/bookmarks/views/default/object/bookmarks.php b/mod/bookmarks/views/default/object/bookmarks.php
index 784263232..bdd623bb5 100644
--- a/mod/bookmarks/views/default/object/bookmarks.php
+++ b/mod/bookmarks/views/default/object/bookmarks.php
@@ -50,7 +50,7 @@ $metadata = elgg_view_menu('entity', array(
 	'class' => 'elgg-menu-hz',
 ));
 
-$subtitle = "$author_text $date $categories $comments_link";
+$subtitle = "$author_text $date $comments_link $categories";
 
 // do not show the metadata and controls in widget view
 if (elgg_in_context('widgets')) {
diff --git a/mod/file/views/default/object/file.php b/mod/file/views/default/object/file.php
index fbd585b8a..874d8fb07 100644
--- a/mod/file/views/default/object/file.php
+++ b/mod/file/views/default/object/file.php
@@ -53,7 +53,7 @@ $metadata = elgg_view_menu('entity', array(
 	'class' => 'elgg-menu-hz',
 ));
 
-$subtitle = "$author_text $date $categories $comments_link";
+$subtitle = "$author_text $date $comments_link $categories";
 
 // do not show the metadata and controls in widget view
 if (elgg_in_context('widgets')) {
diff --git a/mod/pages/views/default/forms/pages/edit.php b/mod/pages/views/default/forms/pages/edit.php
index c29de1085..20737a121 100644
--- a/mod/pages/views/default/forms/pages/edit.php
+++ b/mod/pages/views/default/forms/pages/edit.php
@@ -24,7 +24,7 @@ foreach ($variables as $name => $type) {
 <?php
 }
 
-$cats = elgg_view('categories', $vars);
+$cats = elgg_view('input/categories', $vars);
 if (!empty($cats)) {
 	echo $cats;
 }
diff --git a/mod/pages/views/default/object/page_top.php b/mod/pages/views/default/object/page_top.php
index 0f7b51a0e..08cdd6e2d 100644
--- a/mod/pages/views/default/object/page_top.php
+++ b/mod/pages/views/default/object/page_top.php
@@ -46,6 +46,7 @@ $editor_link = elgg_view('output/url', array(
 $date = elgg_view_friendly_time($annotation->time_created);
 $editor_text = elgg_echo('pages:strapline', array($date, $editor_link));
 $tags = elgg_view('output/tags', array('tags' => $page->tags));
+$categories = elgg_view('output/categories', $vars);
 
 $comments_count = $page->countComments();
 //only display if there are commments
@@ -67,7 +68,7 @@ $metadata = elgg_view_menu('entity', array(
 	'class' => 'elgg-menu-hz',
 ));
 
-$subtitle = "$editor_text $categories $comments_link";
+$subtitle = "$editor_text $comments_link $categories";
 
 // do not show the metadata and controls in widget view
 if (elgg_in_context('widgets') || $revision) {
-- 
cgit v1.2.3