aboutsummaryrefslogtreecommitdiff
path: root/mod
diff options
context:
space:
mode:
Diffstat (limited to 'mod')
m---------mod/autosubscribegroup0
m---------mod/basic_theme5
-rw-r--r--mod/blog/views/default/blog/sidebar/archives.php7
m---------mod/bulk_user_admin0
m---------mod/captcha0
m---------mod/ckeditor0
m---------mod/cool_theme0
m---------mod/curatedgroups0
-rw-r--r--mod/custom_index/index.php5
-rw-r--r--mod/custom_index/views/default/page/layouts/custom_index.php9
m---------mod/editablecomments0
m---------mod/elgg-favorites0
m---------mod/event_connect0
m---------mod/faq0
m---------mod/foafssl0
m---------mod/graphstats0
-rw-r--r--mod/groups/upgrades/2011030101.php3
m---------mod/infinite_scroll0
m---------mod/landing0
m---------mod/less0
m---------mod/lightbox0
m---------mod/lorea-status0
m---------mod/magic_topbar0
-rw-r--r--mod/messages/actions/messages/send.php2
-rw-r--r--mod/messages/start.php3
-rw-r--r--mod/messages/views/default/forms/messages/reply.php7
m---------mod/minify0
m---------mod/profile_friendlyurl0
m---------mod/saravea_theme0
m---------mod/vegan0
30 files changed, 34 insertions, 7 deletions
diff --git a/mod/autosubscribegroup b/mod/autosubscribegroup
new file mode 160000
+Subproject 5e933d6ede62fe62d2e6425e7b1e5fdc7d93d47
diff --git a/mod/basic_theme b/mod/basic_theme
new file mode 160000
+Subproject b0e908f45134d8730954f4cc0d88ebf9b5c3eb4
diff --git a/mod/blog/views/default/blog/sidebar/archives.php b/mod/blog/views/default/blog/sidebar/archives.php
index 5098e6e3e..6529887d4 100644
--- a/mod/blog/views/default/blog/sidebar/archives.php
+++ b/mod/blog/views/default/blog/sidebar/archives.php
@@ -3,9 +3,12 @@
* Blog archives
*/
-$loggedin_user = elgg_get_logged_in_user_entity();
$page_owner = elgg_get_page_owner_entity();
+if (!$page_owner) {
+ return true;
+}
+
if (elgg_instanceof($page_owner, 'user')) {
$url_segment = 'blog/archive/' . $page_owner->username;
} else {
@@ -31,4 +34,4 @@ if ($page_owner && $vars['page'] != 'friends') {
echo elgg_view_module('aside', $title, $content);
}
-} \ No newline at end of file
+}
diff --git a/mod/bulk_user_admin b/mod/bulk_user_admin
new file mode 160000
+Subproject 17664c9c5af5ee2d74b7c378ccc52ee65074ad6
diff --git a/mod/captcha b/mod/captcha
new file mode 160000
+Subproject c7ac34e65fed6e9fc08f85dc4734b29c4fd5114
diff --git a/mod/ckeditor b/mod/ckeditor
new file mode 160000
+Subproject 9f4ede06562e229a26d7ae8d32ebb23453c293e
diff --git a/mod/cool_theme b/mod/cool_theme
new file mode 160000
+Subproject a26f7df43a266f7d1ff04847da330d15f6041e9
diff --git a/mod/curatedgroups b/mod/curatedgroups
new file mode 160000
+Subproject fb2fc6f267b9c3c7e6c5055412b716ce22b34a3
diff --git a/mod/custom_index/index.php b/mod/custom_index/index.php
index 05771f576..43cab9723 100644
--- a/mod/custom_index/index.php
+++ b/mod/custom_index/index.php
@@ -24,6 +24,10 @@ $blogs = elgg_list_entities($list_params);
$list_params['subtype'] = 'bookmarks';
$bookmarks = elgg_list_entities($list_params);
+//grab the latest thewire
+$list_params['subtype'] = 'thewire';
+$thewire = elgg_list_entities($list_params);
+
//grab the latest files
$list_params['subtype'] = 'file';
$files = elgg_list_entities($list_params);
@@ -58,6 +62,7 @@ $params = array(
'groups' => $groups,
'login' => $login,
'members' => $newest_members,
+ 'thewire' => $thewire,
);
$body = elgg_view_layout('custom_index', $params);
diff --git a/mod/custom_index/views/default/page/layouts/custom_index.php b/mod/custom_index/views/default/page/layouts/custom_index.php
index 1267e19b2..4f79754b9 100644
--- a/mod/custom_index/views/default/page/layouts/custom_index.php
+++ b/mod/custom_index/views/default/page/layouts/custom_index.php
@@ -30,6 +30,11 @@ echo elgg_view_module('featured', '', $top_box, $mod_params);
// a view for plugins to extend
echo elgg_view("index/lefthandside");
+// the wire
+if (elgg_is_active_plugin('thewire')) {
+ echo elgg_view_module('thewire', elgg_echo("thewire"), $vars['thewire'], $mod_params);
+}
+
// files
if (elgg_is_active_plugin('file')) {
echo elgg_view_module('featured', elgg_echo("custom:files"), $vars['files'], $mod_params);
@@ -50,8 +55,8 @@ if (elgg_is_active_plugin('groups')) {
// a view for plugins to extend
echo elgg_view("index/righthandside");
-// files
-echo elgg_view_module('featured', elgg_echo("custom:members"), $vars['members'], $mod_params);
+// members
+//echo elgg_view_module('featured', elgg_echo("custom:members"), $vars['members'], $mod_params);
// groups
if (elgg_is_active_plugin('blog')) {
diff --git a/mod/editablecomments b/mod/editablecomments
new file mode 160000
+Subproject b97df962cca29bf292d72c1f174fc6322e59e12
diff --git a/mod/elgg-favorites b/mod/elgg-favorites
new file mode 160000
+Subproject d96e69bd1365c3e3c4d998e72d9941ea1ea2278
diff --git a/mod/event_connect b/mod/event_connect
new file mode 160000
+Subproject 3688c10f1bfdaecdb0bb515b2ce3d8490d0487c
diff --git a/mod/faq b/mod/faq
new file mode 160000
+Subproject b3a038c8ac7db28d5cd47a7ae870f722c24e592
diff --git a/mod/foafssl b/mod/foafssl
new file mode 160000
+Subproject 3c1da1eaff8f61049b45ad99528f8f4e09ac7e6
diff --git a/mod/graphstats b/mod/graphstats
new file mode 160000
+Subproject b5d046138c5841d55b4497618d5678cb8027c24
diff --git a/mod/groups/upgrades/2011030101.php b/mod/groups/upgrades/2011030101.php
index 55edb1a16..3199d76ba 100644
--- a/mod/groups/upgrades/2011030101.php
+++ b/mod/groups/upgrades/2011030101.php
@@ -40,7 +40,8 @@ function groups_2011030101($topic) {
$annotation = $topic->getAnnotations('group_topic_post', 1);
if (!$annotation) {
// no text for this forum post so we delete (probably caused by #2624)
- return $topic->delete();
+ $topic->delete();
+ return;
}
$topic->description = $annotation[0]->value;
diff --git a/mod/infinite_scroll b/mod/infinite_scroll
new file mode 160000
+Subproject 68db72a726e9ccd3603acbf59914c2017276b0e
diff --git a/mod/landing b/mod/landing
new file mode 160000
+Subproject d1ea0d2593cbf55a3804224fd587dbde00672a8
diff --git a/mod/less b/mod/less
new file mode 160000
+Subproject 380edadb3a5e524a8e6ef6df063b678f2f00516
diff --git a/mod/lightbox b/mod/lightbox
new file mode 160000
+Subproject a83b8d89691c31b4568f47790fb40d0bc962aca
diff --git a/mod/lorea-status b/mod/lorea-status
new file mode 160000
+Subproject 6189193ac4771080871f6dab74853051f747490
diff --git a/mod/magic_topbar b/mod/magic_topbar
new file mode 160000
+Subproject 0fdca8adb73fe9e2b5be69c00c15760c8fba336
diff --git a/mod/messages/actions/messages/send.php b/mod/messages/actions/messages/send.php
index 9d9f6c8b7..16a971ad2 100644
--- a/mod/messages/actions/messages/send.php
+++ b/mod/messages/actions/messages/send.php
@@ -11,7 +11,7 @@ $recipient_guid = get_input('recipient_guid');
elgg_make_sticky_form('messages');
-//$reply = get_input('reply',0); // this is the guid of the message replying to
+$reply = get_input('reply',0); // this is the guid of the message replying to
if (!$recipient_guid) {
register_error(elgg_echo("messages:user:blank"));
diff --git a/mod/messages/start.php b/mod/messages/start.php
index 6d0e82744..5c2cb8d0d 100644
--- a/mod/messages/start.php
+++ b/mod/messages/start.php
@@ -103,6 +103,9 @@ function messages_page_handler($page) {
$page[1] = $current_user->username;
}
+ $user = get_user_by_username($page[1]);
+ //elgg_set_page_owner_guid($user->guid);
+
$base_dir = elgg_get_plugins_path() . 'messages/pages/messages';
switch ($page[0]) {
diff --git a/mod/messages/views/default/forms/messages/reply.php b/mod/messages/views/default/forms/messages/reply.php
index 9f3f4b57e..a0a01afce 100644
--- a/mod/messages/views/default/forms/messages/reply.php
+++ b/mod/messages/views/default/forms/messages/reply.php
@@ -15,6 +15,11 @@ echo elgg_view('input/hidden', array(
'name' => 'recipient_guid',
'value' => $vars['message']->fromId,
));
+echo elgg_view('input/hidden', array(
+ 'name' => 'reply',
+ 'value' => $vars['message']->guid,
+));
+
?>
<div>
@@ -35,4 +40,4 @@ echo elgg_view('input/hidden', array(
</div>
<div class="elgg-foot">
<?php echo elgg_view('input/submit', array('value' => elgg_echo('messages:send'))); ?>
-</div> \ No newline at end of file
+</div>
diff --git a/mod/minify b/mod/minify
new file mode 160000
+Subproject 594901859d5afc1fa364322428bd7a6d5c6a3f9
diff --git a/mod/profile_friendlyurl b/mod/profile_friendlyurl
new file mode 160000
+Subproject 1720c0ccf8fb93760b75e5ea25b766ad539c3a5
diff --git a/mod/saravea_theme b/mod/saravea_theme
new file mode 160000
+Subproject 3545725645fbb88f5173bbbe86dc71c2edeb1fd
diff --git a/mod/vegan b/mod/vegan
new file mode 160000
+Subproject e48966e8a43f5da5309a796c5a749f9fcd317a6