aboutsummaryrefslogtreecommitdiff
path: root/mod
diff options
context:
space:
mode:
Diffstat (limited to 'mod')
-rw-r--r--mod/blog/manifest.xml4
-rw-r--r--mod/blog/views/default/forms/blog/save.php2
-rw-r--r--mod/blog/views/default/object/blog.php20
-rw-r--r--mod/bookmarks/manifest.xml4
-rw-r--r--mod/bookmarks/views/default/object/bookmarks.php20
-rw-r--r--mod/categories/manifest.xml4
-rw-r--r--mod/custom_index/manifest.xml4
-rw-r--r--mod/dashboard/manifest.xml4
-rw-r--r--mod/developers/manifest.xml4
-rw-r--r--mod/diagnostics/manifest.xml4
-rw-r--r--mod/diagnostics/views/default/admin/develop_utilities/diagnostics.php11
-rw-r--r--mod/diagnostics/views/default/forms/diagnostics/download.php5
-rw-r--r--mod/embed/manifest.xml6
-rw-r--r--mod/externalpages/manifest.xml4
-rw-r--r--mod/file/manifest.xml6
-rw-r--r--mod/file/views/default/object/file.php25
-rw-r--r--mod/garbagecollector/manifest.xml4
-rw-r--r--mod/groups/manifest.xml4
-rw-r--r--mod/htmlawed/manifest.xml4
-rw-r--r--mod/invitefriends/manifest.xml4
-rw-r--r--mod/likes/manifest.xml4
-rw-r--r--mod/likes/start.php6
-rw-r--r--mod/logbrowser/manifest.xml4
-rw-r--r--mod/logrotate/manifest.xml4
-rw-r--r--mod/members/manifest.xml4
-rw-r--r--mod/messageboard/manifest.xml4
-rw-r--r--mod/messages/manifest.xml4
-rw-r--r--mod/notifications/manifest.xml4
-rw-r--r--mod/oauth_api/manifest.xml4
-rw-r--r--mod/pages/manifest.xml4
-rw-r--r--mod/pages/views/default/forms/pages/edit.php2
-rw-r--r--mod/pages/views/default/object/page_top.php18
-rw-r--r--mod/profile/manifest.xml4
-rw-r--r--mod/profile/views/default/profile/metatags.php4
-rw-r--r--mod/reportedcontent/manifest.xml4
-rw-r--r--mod/search/manifest.xml4
-rw-r--r--mod/tagcloud/manifest.xml4
-rw-r--r--mod/thewire/manifest.xml4
-rw-r--r--mod/tinymce/manifest.xml4
-rw-r--r--mod/twitter/manifest.xml4
-rw-r--r--mod/twitter_api/manifest.xml4
-rw-r--r--mod/uservalidationbyemail/manifest.xml4
-rw-r--r--mod/zaudio/manifest.xml4
43 files changed, 129 insertions, 120 deletions
diff --git a/mod/blog/manifest.xml b/mod/blog/manifest.xml
index dfbd7a1a6..bd5f9c396 100644
--- a/mod/blog/manifest.xml
+++ b/mod/blog/manifest.xml
@@ -12,8 +12,8 @@
<copyright>See COPYRIGHT.txt</copyright>
<license>GNU Public License version 2</license>
<requires>
- <type>elgg_version</type>
- <version>2010030101</version>
+ <type>elgg_release</type>
+ <version>1.8</version>
</requires>
<activate_on_install>true</activate_on_install>
</plugin_manifest>
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..05ddf62c7 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')) {
@@ -67,8 +66,6 @@ if ($full) {
'class' => 'blog-post',
));
- $header = elgg_view_title($blog->title);
-
$params = array(
'entity' => $blog,
'title' => false,
@@ -77,15 +74,14 @@ if ($full) {
'tags' => $tags,
);
$params = $params + $vars;
- $list_body = elgg_view('object/elements/summary', $params);
+ $summary = elgg_view('object/elements/summary', $params);
- $blog_info = elgg_view_image_block($owner_icon, $list_body);
-
- echo <<<HTML
-$header
-$blog_info
-$body
-HTML;
+ echo elgg_view('object/elements/full', array(
+ 'title' => $blog->title,
+ 'summary' => $summary,
+ 'icon' => $owner_icon,
+ 'body' => $body,
+ ));
} else {
// brief view
diff --git a/mod/bookmarks/manifest.xml b/mod/bookmarks/manifest.xml
index 24969b837..679d3f1d8 100644
--- a/mod/bookmarks/manifest.xml
+++ b/mod/bookmarks/manifest.xml
@@ -12,8 +12,8 @@
<copyright>See COPYRIGHT.txt</copyright>
<license>GNU Public License version 2</license>
<requires>
- <type>elgg_version</type>
- <version>2010030101</version>
+ <type>elgg_release</type>
+ <version>1.8</version>
</requires>
<activate_on_install>true</activate_on_install>
</plugin_manifest>
diff --git a/mod/bookmarks/views/default/object/bookmarks.php b/mod/bookmarks/views/default/object/bookmarks.php
index 784263232..ba8029a54 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')) {
@@ -58,7 +58,6 @@ if (elgg_in_context('widgets')) {
}
if ($full && !elgg_in_context('gallery')) {
- $header = elgg_view_title($bookmark->title);
$params = array(
'entity' => $bookmark,
@@ -68,19 +67,24 @@ if ($full && !elgg_in_context('gallery')) {
'tags' => $tags,
);
$params = $params + $vars;
- $list_body = elgg_view('object/elements/summary', $params);
- $bookmark_info = elgg_view_image_block($owner_icon, $list_body);
+ $summary = elgg_view('object/elements/summary', $params);
$bookmark_icon = elgg_view_icon('push-pin-alt');
- echo <<<HTML
-$header
-$bookmark_info
+ $body = <<<HTML
<div class="bookmark elgg-content mts">
$bookmark_icon<span class="elgg-heading-basic mbs">$link</span>
$description
</div>
HTML;
+ echo elgg_view('object/elements/full', array(
+ 'entity' => $bookmark,
+ 'title' => $bookmark->title,
+ 'icon' => $owner_icon,
+ 'summary' => $summary,
+ 'body' => $body,
+ ));
+
} elseif (elgg_in_context('gallery')) {
echo <<<HTML
<div class="bookmarks-gallery-item">
@@ -124,4 +128,4 @@ HTML;
$body = elgg_view('object/elements/summary', $params);
echo elgg_view_image_block($owner_icon, $body);
-} \ No newline at end of file
+}
diff --git a/mod/categories/manifest.xml b/mod/categories/manifest.xml
index db6f0324f..a2f4d97fc 100644
--- a/mod/categories/manifest.xml
+++ b/mod/categories/manifest.xml
@@ -11,7 +11,7 @@
<copyright>See COPYRIGHT.txt</copyright>
<license>GNU Public License version 2</license>
<requires>
- <type>elgg_version</type>
- <version>2010030101</version>
+ <type>elgg_release</type>
+ <version>1.8</version>
</requires>
</plugin_manifest>
diff --git a/mod/custom_index/manifest.xml b/mod/custom_index/manifest.xml
index dd00f2c49..f93251214 100644
--- a/mod/custom_index/manifest.xml
+++ b/mod/custom_index/manifest.xml
@@ -9,7 +9,7 @@
<copyright>See COPYRIGHT.txt</copyright>
<license>GNU Public License version 2</license>
<requires>
- <type>elgg_version</type>
- <version>2009030702</version>
+ <type>elgg_release</type>
+ <version>1.8</version>
</requires>
</plugin_manifest>
diff --git a/mod/dashboard/manifest.xml b/mod/dashboard/manifest.xml
index 7096fc86a..14a620268 100644
--- a/mod/dashboard/manifest.xml
+++ b/mod/dashboard/manifest.xml
@@ -9,7 +9,7 @@
<copyright>See COPYRIGHT.txt</copyright>
<license>GNU Public License version 2</license>
<requires>
- <type>elgg_version</type>
- <version>2010030101</version>
+ <type>elgg_release</type>
+ <version>1.8</version>
</requires>
</plugin_manifest>
diff --git a/mod/developers/manifest.xml b/mod/developers/manifest.xml
index 25840e164..6b672e231 100644
--- a/mod/developers/manifest.xml
+++ b/mod/developers/manifest.xml
@@ -12,7 +12,7 @@
<license>GNU Public License version 2</license>
<requires>
- <type>elgg_version</type>
- <version>2009030802</version>
+ <type>elgg_release</type>
+ <version>1.8</version>
</requires>
</plugin_manifest>
diff --git a/mod/diagnostics/manifest.xml b/mod/diagnostics/manifest.xml
index 5ebd7cf55..a9034d695 100644
--- a/mod/diagnostics/manifest.xml
+++ b/mod/diagnostics/manifest.xml
@@ -11,7 +11,7 @@
<copyright>See COPYRIGHT.txt</copyright>
<license>GNU Public License version 2</license>
<requires>
- <type>elgg_version</type>
- <version>2010030101</version>
+ <type>elgg_release</type>
+ <version>1.8</version>
</requires>
</plugin_manifest>
diff --git a/mod/diagnostics/views/default/admin/develop_utilities/diagnostics.php b/mod/diagnostics/views/default/admin/develop_utilities/diagnostics.php
index b41907da2..02151174c 100644
--- a/mod/diagnostics/views/default/admin/develop_utilities/diagnostics.php
+++ b/mod/diagnostics/views/default/admin/develop_utilities/diagnostics.php
@@ -4,8 +4,15 @@
*/
$diagnostics_title = elgg_echo('diagnostics:report');
-$diagnostics = elgg_echo('diagnostics:description');
-$diagnostics .= elgg_view_form('diagnostics/download');
+$diagnostics = '<p>' . elgg_echo('diagnostics:description') .'</p>';
+$params = array(
+ 'text' => elgg_echo('diagnostics:download'),
+ 'href' => 'action/diagnostics/download',
+ 'class' => 'elgg-button elgg-button-submit',
+ 'is_action' => true,
+ 'is_trusted' => true,
+);
+$diagnostics .= '<p>' . elgg_view('output/url', $params) . '</p>';
// unit tests
$unit_tests_title = elgg_echo('diagnostics:unittester');
diff --git a/mod/diagnostics/views/default/forms/diagnostics/download.php b/mod/diagnostics/views/default/forms/diagnostics/download.php
deleted file mode 100644
index b0abe8434..000000000
--- a/mod/diagnostics/views/default/forms/diagnostics/download.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-/**
- * Diagnostics download form
- */
-echo elgg_view('input/submit', array('value' => elgg_echo('diagnostics:download'))); \ No newline at end of file
diff --git a/mod/embed/manifest.xml b/mod/embed/manifest.xml
index 27e9b9ada..c33c8b40a 100644
--- a/mod/embed/manifest.xml
+++ b/mod/embed/manifest.xml
@@ -2,7 +2,7 @@
<plugin_manifest xmlns="http://www.elgg.org/plugin_manifest/1.8">
<name>Embed</name>
<author>Core developers</author>
- <version>1.8</version>
+ <version>1.8.1</version>
<category>bundled</category>
<category>enhancement</category>
<description>Allows users to easily upload and embed media into text areas.</description>
@@ -10,8 +10,8 @@
<copyright>See COPYRIGHT.txt</copyright>
<license>GNU Public License version 2</license>
<requires>
- <type>elgg_version</type>
- <version>2010030101</version>
+ <type>elgg_release</type>
+ <version>1.8</version>
</requires>
<requires>
<type>plugin</type>
diff --git a/mod/externalpages/manifest.xml b/mod/externalpages/manifest.xml
index 4064ea602..389ad6960 100644
--- a/mod/externalpages/manifest.xml
+++ b/mod/externalpages/manifest.xml
@@ -9,7 +9,7 @@
<copyright>See COPYRIGHT.txt</copyright>
<license>GNU Public License version 2</license>
<requires>
- <type>elgg_version</type>
- <version>2010030101</version>
+ <type>elgg_release</type>
+ <version>1.8</version>
</requires>
</plugin_manifest>
diff --git a/mod/file/manifest.xml b/mod/file/manifest.xml
index 8a80e38dc..85ff76b41 100644
--- a/mod/file/manifest.xml
+++ b/mod/file/manifest.xml
@@ -2,7 +2,7 @@
<plugin_manifest xmlns="http://www.elgg.org/plugin_manifest/1.8">
<name>File</name>
<author>Core developers</author>
- <version>1.8</version>
+ <version>1.8.1</version>
<category>bundled</category>
<category>content</category>
<category>widget</category>
@@ -11,8 +11,8 @@
<copyright>See COPYRIGHT.txt</copyright>
<license>GNU Public License version 2</license>
<requires>
- <type>elgg_version</type>
- <version>2010030101</version>
+ <type>elgg_release</type>
+ <version>1.8</version>
</requires>
<activate_on_install>true</activate_on_install>
</plugin_manifest>
diff --git a/mod/file/views/default/object/file.php b/mod/file/views/default/object/file.php
index fbd585b8a..81421133f 100644
--- a/mod/file/views/default/object/file.php
+++ b/mod/file/views/default/object/file.php
@@ -19,8 +19,6 @@ $excerpt = elgg_get_excerpt($file->description);
$mime = $file->mimetype;
$base_type = substr($mime, 0, strpos($mime,'/'));
-$body = elgg_view('output/longtext', array('value' => $file->description));
-
$owner_link = elgg_view('output/url', array(
'href' => "file/owner/$owner->username",
'text' => $owner->name,
@@ -53,7 +51,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')) {
@@ -69,8 +67,6 @@ if ($full && !elgg_in_context('gallery')) {
$extra = elgg_view("file/specialcontent/$base_type/default", $vars);
}
- $header = elgg_view_title($file->title);
-
$params = array(
'entity' => $file,
'title' => false,
@@ -79,17 +75,18 @@ if ($full && !elgg_in_context('gallery')) {
'tags' => $tags,
);
$params = $params + $vars;
- $list_body = elgg_view('object/elements/summary', $params);
+ $summary = elgg_view('object/elements/summary', $params);
- $file_info = elgg_view_image_block($file_icon, $list_body);
+ $text = elgg_view('output/longtext', array('value' => $file->description));
+ $body = "$text $extra";
- echo <<<HTML
-$file_info
-<div class="file elgg-content">
- $body
- $extra
-</div>
-HTML;
+ echo elgg_view('object/elements/full', array(
+ 'entity' => $file,
+ 'title' => false,
+ 'icon' => $file_icon,
+ 'summary' => $summary,
+ 'body' => $body,
+ ));
} elseif (elgg_in_context('gallery')) {
echo '<div class="file-gallery-item">';
diff --git a/mod/garbagecollector/manifest.xml b/mod/garbagecollector/manifest.xml
index 0da71cd6b..1cbf33592 100644
--- a/mod/garbagecollector/manifest.xml
+++ b/mod/garbagecollector/manifest.xml
@@ -10,8 +10,8 @@
<copyright>See COPYRIGHT.txt</copyright>
<license>GNU Public License version 2</license>
<requires>
- <type>elgg_version</type>
- <version>2009030702</version>
+ <type>elgg_release</type>
+ <version>1.8</version>
</requires>
<activate_on_install>true</activate_on_install>
</plugin_manifest>
diff --git a/mod/groups/manifest.xml b/mod/groups/manifest.xml
index 542e9de01..b8fd92de7 100644
--- a/mod/groups/manifest.xml
+++ b/mod/groups/manifest.xml
@@ -11,8 +11,8 @@
<copyright>See COPYRIGHT.txt</copyright>
<license>GNU Public License version 2</license>
<requires>
- <type>elgg_version</type>
- <version>2010030101</version>
+ <type>elgg_release</type>
+ <version>1.8</version>
</requires>
<activate_on_install>true</activate_on_install>
</plugin_manifest>
diff --git a/mod/htmlawed/manifest.xml b/mod/htmlawed/manifest.xml
index b176834e5..aac599dee 100644
--- a/mod/htmlawed/manifest.xml
+++ b/mod/htmlawed/manifest.xml
@@ -10,8 +10,8 @@
<copyright>See COPYRIGHT.txt</copyright>
<license>GNU Public License version 3</license>
<requires>
- <type>elgg_version</type>
- <version>2009041701</version>
+ <type>elgg_release</type>
+ <version>1.8</version>
</requires>
<activate_on_install>true</activate_on_install>
</plugin_manifest>
diff --git a/mod/invitefriends/manifest.xml b/mod/invitefriends/manifest.xml
index 75a2d17f2..0a1ed2012 100644
--- a/mod/invitefriends/manifest.xml
+++ b/mod/invitefriends/manifest.xml
@@ -10,8 +10,8 @@
<copyright>See COPYRIGHT.txt</copyright>
<license>GNU Public License version 2</license>
<requires>
- <type>elgg_version</type>
- <version>2010030101</version>
+ <type>elgg_release</type>
+ <version>1.8</version>
</requires>
<activate_on_install>true</activate_on_install>
</plugin_manifest>
diff --git a/mod/likes/manifest.xml b/mod/likes/manifest.xml
index 946cfd86b..5a18b8862 100644
--- a/mod/likes/manifest.xml
+++ b/mod/likes/manifest.xml
@@ -10,8 +10,8 @@
<copyright>See COPYRIGHT.txt</copyright>
<license>GNU Public License version 2</license>
<requires>
- <type>elgg_version</type>
- <version>2010030101</version>
+ <type>elgg_release</type>
+ <version>1.8</version>
</requires>
<activate_on_install>true</activate_on_install>
</plugin_manifest>
diff --git a/mod/likes/start.php b/mod/likes/start.php
index 76b48a369..690d7c052 100644
--- a/mod/likes/start.php
+++ b/mod/likes/start.php
@@ -60,6 +60,12 @@ function likes_entity_menu_setup($hook, $type, $return, $params) {
function likes_river_menu_setup($hook, $type, $return, $params) {
if (elgg_is_logged_in()) {
$item = $params['item'];
+
+ // only like group creation #3958
+ if ($item->type == "group" && $item->view != "river/group/create") {
+ return $return;
+ }
+
$object = $item->getObjectEntity();
if (!elgg_in_context('widgets') && $item->annotation_id == 0) {
if ($object->canAnnotate(0, 'likes')) {
diff --git a/mod/logbrowser/manifest.xml b/mod/logbrowser/manifest.xml
index 846ad155a..d3b76ee8c 100644
--- a/mod/logbrowser/manifest.xml
+++ b/mod/logbrowser/manifest.xml
@@ -10,8 +10,8 @@
<copyright>See COPYRIGHT.txt</copyright>
<license>GNU Public License version 2</license>
<requires>
- <type>elgg_version</type>
- <version>2009030702</version>
+ <type>elgg_release</type>
+ <version>1.8</version>
</requires>
<activate_on_install>true</activate_on_install>
</plugin_manifest>
diff --git a/mod/logrotate/manifest.xml b/mod/logrotate/manifest.xml
index 503bf6cd1..db04e762f 100644
--- a/mod/logrotate/manifest.xml
+++ b/mod/logrotate/manifest.xml
@@ -10,8 +10,8 @@
<copyright>See COPYRIGHT.txt</copyright>
<license>GNU Public License version 2</license>
<requires>
- <type>elgg_version</type>
- <version>2009030702</version>
+ <type>elgg_release</type>
+ <version>1.8</version>
</requires>
<activate_on_install>true</activate_on_install>
</plugin_manifest>
diff --git a/mod/members/manifest.xml b/mod/members/manifest.xml
index f5e95eb41..efd1ede5e 100644
--- a/mod/members/manifest.xml
+++ b/mod/members/manifest.xml
@@ -9,8 +9,8 @@
<copyright>See COPYRIGHT.txt</copyright>
<license>GNU Public License version 2</license>
<requires>
- <type>elgg_version</type>
- <version>2010030101</version>
+ <type>elgg_release</type>
+ <version>1.8</version>
</requires>
<activate_on_install>true</activate_on_install>
</plugin_manifest>
diff --git a/mod/messageboard/manifest.xml b/mod/messageboard/manifest.xml
index 5881c4e46..b4f74c7d0 100644
--- a/mod/messageboard/manifest.xml
+++ b/mod/messageboard/manifest.xml
@@ -10,8 +10,8 @@
<copyright>See COPYRIGHT.txt</copyright>
<license>GNU Public License version 2</license>
<requires>
- <type>elgg_version</type>
- <version>2010030101</version>
+ <type>elgg_release</type>
+ <version>1.8</version>
</requires>
<activate_on_install>true</activate_on_install>
</plugin_manifest>
diff --git a/mod/messages/manifest.xml b/mod/messages/manifest.xml
index 30acc240d..238ccf42b 100644
--- a/mod/messages/manifest.xml
+++ b/mod/messages/manifest.xml
@@ -10,8 +10,8 @@
<website>http://www.elgg.org/</website>
<license>GNU Public License version 2</license>
<requires>
- <type>elgg_version</type>
- <version>2010030101</version>
+ <type>elgg_release</type>
+ <version>1.8</version>
</requires>
<activate_on_install>true</activate_on_install>
</plugin_manifest>
diff --git a/mod/notifications/manifest.xml b/mod/notifications/manifest.xml
index 97b88fb75..a07486331 100644
--- a/mod/notifications/manifest.xml
+++ b/mod/notifications/manifest.xml
@@ -9,8 +9,8 @@
<copyright>See COPYRIGHT.txt</copyright>
<license>GNU Public License version 2</license>
<requires>
- <type>elgg_version</type>
- <version>2010030101</version>
+ <type>elgg_release</type>
+ <version>1.8</version>
</requires>
<activate_on_install>true</activate_on_install>
</plugin_manifest>
diff --git a/mod/oauth_api/manifest.xml b/mod/oauth_api/manifest.xml
index a0e3c4fda..62111e258 100644
--- a/mod/oauth_api/manifest.xml
+++ b/mod/oauth_api/manifest.xml
@@ -10,8 +10,8 @@
<copyright>See COPYRIGHT.txt</copyright>
<license>GNU Public License version 2</license>
<requires>
- <type>elgg_version</type>
- <version>2010040201</version>
+ <type>elgg_release</type>
+ <version>1.8</version>
</requires>
<conflicts>
diff --git a/mod/pages/manifest.xml b/mod/pages/manifest.xml
index a91881cab..dfc521e11 100644
--- a/mod/pages/manifest.xml
+++ b/mod/pages/manifest.xml
@@ -11,8 +11,8 @@
<copyright>See COPYRIGHT.txt</copyright>
<license>GNU Public License version 2</license>
<requires>
- <type>elgg_version</type>
- <version>2010030101</version>
+ <type>elgg_release</type>
+ <version>1.8</version>
</requires>
<activate_on_install>true</activate_on_install>
</plugin_manifest>
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..0a1c33458 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) {
@@ -85,14 +86,15 @@ if ($full) {
'tags' => $tags,
);
$params = $params + $vars;
- $list_body = elgg_view('object/elements/summary', $params);
-
- $info = elgg_view_image_block($page_icon, $list_body);
+ $summary = elgg_view('object/elements/summary', $params);
- echo <<<HTML
-$info
-$body
-HTML;
+ echo elgg_view('object/elements/full', array(
+ 'entity' => $page,
+ 'title' => false,
+ 'icon' => $page_icon,
+ 'summary' => $summary,
+ 'body' => $body,
+ ));
} else {
// brief view
diff --git a/mod/profile/manifest.xml b/mod/profile/manifest.xml
index a1cff4dc2..f56604c7e 100644
--- a/mod/profile/manifest.xml
+++ b/mod/profile/manifest.xml
@@ -11,7 +11,7 @@
<license>GNU Public License Version 2</license>
<activate_on_install>true</activate_on_install>
<requires>
- <type>elgg_version</type>
- <version>2011010401</version>
+ <type>elgg_release</type>
+ <version>1.8</version>
</requires>
</plugin_manifest>
diff --git a/mod/profile/views/default/profile/metatags.php b/mod/profile/views/default/profile/metatags.php
index 54ee322e2..c6f674e6d 100644
--- a/mod/profile/views/default/profile/metatags.php
+++ b/mod/profile/views/default/profile/metatags.php
@@ -6,7 +6,9 @@
*
*/
-if (elgg_get_page_owner_entity()) {
+$owner = elgg_get_page_owner_entity();
+
+if (elgg_instanceof($owner, 'user')) {
?>
<link rel="meta" type="application/rdf+xml" title="FOAF" href="<?php echo full_url(); ?>?view=foaf" />
<?php
diff --git a/mod/reportedcontent/manifest.xml b/mod/reportedcontent/manifest.xml
index d65b55ca3..aea8f8114 100644
--- a/mod/reportedcontent/manifest.xml
+++ b/mod/reportedcontent/manifest.xml
@@ -9,8 +9,8 @@
<copyright>See COPYRIGHT.txt</copyright>
<license>GNU Public License version 2</license>
<requires>
- <type>elgg_version</type>
- <version>2010030101</version>
+ <type>elgg_release</type>
+ <version>1.8</version>
</requires>
<activate_on_install>true</activate_on_install>
</plugin_manifest>
diff --git a/mod/search/manifest.xml b/mod/search/manifest.xml
index b13e127d0..9a952d3d8 100644
--- a/mod/search/manifest.xml
+++ b/mod/search/manifest.xml
@@ -9,8 +9,8 @@
<copyright>See COPYRIGHT.txt</copyright>
<license>GNU Public License version 2</license>
<requires>
- <type>elgg_version</type>
- <version>2009030702</version>
+ <type>elgg_release</type>
+ <version>1.8</version>
</requires>
<activate_on_install>true</activate_on_install>
</plugin_manifest>
diff --git a/mod/tagcloud/manifest.xml b/mod/tagcloud/manifest.xml
index 7c64829fc..1127e9559 100644
--- a/mod/tagcloud/manifest.xml
+++ b/mod/tagcloud/manifest.xml
@@ -10,7 +10,7 @@
<copyright>See COPYRIGHT.txt</copyright>
<license>GNU Public License version 2</license>
<requires>
- <type>elgg_version</type>
- <version>2010030101</version>
+ <type>elgg_release</type>
+ <version>1.8</version>
</requires>
</plugin_manifest>
diff --git a/mod/thewire/manifest.xml b/mod/thewire/manifest.xml
index 74e811bed..9f6b0eaa9 100644
--- a/mod/thewire/manifest.xml
+++ b/mod/thewire/manifest.xml
@@ -10,8 +10,8 @@
<copyright>See COPYRIGHT.txt</copyright>
<license>GNU Public License version 2</license>
<requires>
- <type>elgg_version</type>
- <version>2010030101</version>
+ <type>elgg_release</type>
+ <version>1.8</version>
</requires>
<activate_on_install>true</activate_on_install>
</plugin_manifest>
diff --git a/mod/tinymce/manifest.xml b/mod/tinymce/manifest.xml
index 2d062d399..ac7b23b29 100644
--- a/mod/tinymce/manifest.xml
+++ b/mod/tinymce/manifest.xml
@@ -10,8 +10,8 @@
<copyright>See COPYRIGHT.txt</copyright>
<license>GNU Public License version 2</license>
<requires>
- <type>elgg_version</type>
- <version>2010030101</version>
+ <type>elgg_release</type>
+ <version>1.8</version>
</requires>
<activate_on_install>true</activate_on_install>
</plugin_manifest>
diff --git a/mod/twitter/manifest.xml b/mod/twitter/manifest.xml
index ffb6ccc05..38380a2ba 100644
--- a/mod/twitter/manifest.xml
+++ b/mod/twitter/manifest.xml
@@ -10,7 +10,7 @@
<copyright>See COPYRIGHT.txt</copyright>
<license>GNU Public License version 2</license>
<requires>
- <type>elgg_version</type>
- <version>2010030101</version>
+ <type>elgg_release</type>
+ <version>1.8</version>
</requires>
</plugin_manifest>
diff --git a/mod/twitter_api/manifest.xml b/mod/twitter_api/manifest.xml
index 38b1dc9a7..51ad0dcb4 100644
--- a/mod/twitter_api/manifest.xml
+++ b/mod/twitter_api/manifest.xml
@@ -10,8 +10,8 @@
<copyright>See COPYRIGHT.txt</copyright>
<license>GNU Public License version 2</license>
<requires>
- <type>elgg_version</type>
- <version>2010040201</version>
+ <type>elgg_release</type>
+ <version>1.8</version>
</requires>
<requires>
<type>plugin</type>
diff --git a/mod/uservalidationbyemail/manifest.xml b/mod/uservalidationbyemail/manifest.xml
index 3358e1119..232ba71ca 100644
--- a/mod/uservalidationbyemail/manifest.xml
+++ b/mod/uservalidationbyemail/manifest.xml
@@ -10,8 +10,8 @@
<copyright>See COPYRIGHT.txt</copyright>
<license>GNU Public License version 2</license>
<requires>
- <type>elgg_version</type>
- <version>2009033101</version>
+ <type>elgg_release</type>
+ <version>1.8</version>
</requires>
<activate_on_install>true</activate_on_install>
</plugin_manifest>
diff --git a/mod/zaudio/manifest.xml b/mod/zaudio/manifest.xml
index 423a7e863..767637a56 100644
--- a/mod/zaudio/manifest.xml
+++ b/mod/zaudio/manifest.xml
@@ -11,8 +11,8 @@
<copyright>See COPYRIGHT.txt</copyright>
<license>GNU Public License version 2</license>
<requires>
- <type>elgg_version</type>
- <version>2010111501</version>
+ <type>elgg_release</type>
+ <version>1.8</version>
</requires>
<activate_on_install>true</activate_on_install>
</plugin_manifest>