Changeset 190

Timestamp:

01/09/09 17:36:37 (20 months ago)

Author:

kester

Message:

merging r189 og upgrade from -rc to 5--8-0

Location:

trunk/sites/all/modules/og

Files:

• . (modified) (1 prop)
• CVS/Entries (modified) (1 diff)
• CVS/Entries.Log (deleted)
• CVS/Tag (modified) (1 diff)
• includes/CVS/Entries (modified) (1 diff)
• includes/CVS/Tag (modified) (1 diff)
• og.module (modified) (5 diffs)
• og_notifications/CVS/Entries (modified) (1 diff)
• og_notifications/CVS/Entries.Log (deleted)
• og_notifications/CVS/Tag (modified) (1 diff)
• og_notifications/po/CVS/Entries (modified) (1 diff)
• og_notifications/po/CVS/Tag (modified) (1 diff)
• po/CVS/Entries (modified) (1 diff)
• po/CVS/Tag (modified) (1 diff)
• tests/CVS/Entries (modified) (1 diff)
• tests/CVS/Tag (modified) (1 diff)

trunk/sites/all/modules/og

@@ -1 @@
-/branches/kester/current/sites/all/modules/og:126-131
+/branches/kester/current/sites/all/modules/og:126-131,189
 /external/current/sites/all/modules/messaging/og:130
-/external/current/sites/all/modules/og:127,129
+/external/current/sites/all/modules/og:127,129,188

@@ -1 @@
-/branches/kester/current/sites/all/modules/og:126-131
+/branches/kester/current/sites/all/modules/og:126-131,189
 /external/current/sites/all/modules/messaging/og:130
-/external/current/sites/all/modules/og:127,129
+/external/current/sites/all/modules/og:127,129,188

trunk/sites/all/modules/og/CVS/Entries

@@ -1 @@
-/README.txt/1.36.2.17.2.1/Tue Sep  9 19:07:28 2008//TDRUPAL-5--8-0-RC1
-/node-og.tpl.php/1.4.2.2/Sun Nov 19 13:14:01 2006//TDRUPAL-5--8-0-RC1
-/node.tpl.php/1.5.2.4/Tue Mar 18 15:18:39 2008//TDRUPAL-5--8-0-RC1
-/og.css/1.2.2.10/Wed Apr  2 21:37:54 2008//TDRUPAL-5--8-0-RC1
-/og.info/1.3.2.2/Sun Nov 19 13:14:01 2006//TDRUPAL-5--8-0-RC1
-/og.install/1.21.2.32.2.8/Thu Oct  9 15:06:14 2008//TDRUPAL-5--8-0-RC1
-/og.module/1.298.2.197.2.15/Sun Nov  2 20:30:45 2008//TDRUPAL-5--8-0-RC1
-/og_access.info/1.1.2.2/Tue Apr 15 17:00:27 2008//TDRUPAL-5--8-0-RC1
-/og_access.install/1.1.2.4/Wed Apr 23 14:40:31 2008//TDRUPAL-5--8-0-RC1
-/og_access.js/1.1.2.4/Fri May  2 01:37:39 2008//TDRUPAL-5--8-0-RC1
-/og_access.module/1.1.2.11/Mon May 26 14:03:35 2008//TDRUPAL-5--8-0-RC1
-/og_panels.info/1.1.2.2/Tue Feb 26 22:38:13 2008//TDRUPAL-5--8-0-RC1
-/og_panels.install/1.1.2.4.2.1/Fri Oct 31 12:16:14 2008//TDRUPAL-5--8-0-RC1
-/og_panels.module/1.1.2.32.2.1/Fri Oct 31 12:12:27 2008//TDRUPAL-5--8-0-RC1
-/og_views.inc/1.12.2.55.2.4/Mon Oct  6 07:56:45 2008//TDRUPAL-5--8-0-RC1
-/og_workflow_ng.inc/1.1.2.4/Thu Jul 31 20:08:16 2008//TDRUPAL-5--8-0-RC1
-/og_xmlrpc.inc/1.1.4.4/Mon May 26 14:03:35 2008//TDRUPAL-5--8-0-RC1
-/opml.gif/1.1.2.2/Sun Nov 19 13:14:01 2006/-kb/TDRUPAL-5--8-0-RC1
-/user-multiple.png/1.1.2.2/Wed Mar 19 05:56:40 2008/-kb/TDRUPAL-5--8-0-RC1
-D
+D/includes////
+D/og_notifications////
+D/po////
+D/tests////
+/README.txt/1.36.2.17.2.1/Tue Sep  9 19:07:28 2008//TDRUPAL-5--8-0
+/node-og.tpl.php/1.4.2.2/Sun Nov 19 13:14:01 2006//TDRUPAL-5--8-0
+/node.tpl.php/1.5.2.4/Tue Mar 18 15:18:39 2008//TDRUPAL-5--8-0
+/og.css/1.2.2.10/Wed Apr  2 21:37:54 2008//TDRUPAL-5--8-0
+/og.info/1.3.2.2/Sun Nov 19 13:14:01 2006//TDRUPAL-5--8-0
+/og.install/1.21.2.32.2.8/Thu Oct  9 15:06:14 2008//TDRUPAL-5--8-0
+/og.module/1.298.2.197.2.18/Fri Jan  9 16:26:05 2009//TDRUPAL-5--8-0
+/og_access.info/1.1.2.2/Tue Apr 15 17:00:27 2008//TDRUPAL-5--8-0
+/og_access.install/1.1.2.4/Wed Apr 23 14:40:31 2008//TDRUPAL-5--8-0
+/og_access.js/1.1.2.4/Fri May  2 01:37:39 2008//TDRUPAL-5--8-0
+/og_access.module/1.1.2.11/Mon May 26 14:03:35 2008//TDRUPAL-5--8-0
+/og_panels.info/1.1.2.2/Tue Feb 26 22:38:13 2008//TDRUPAL-5--8-0
+/og_panels.install/1.1.2.4.2.1/Fri Oct 31 12:16:14 2008//TDRUPAL-5--8-0
+/og_panels.module/1.1.2.32.2.1/Fri Oct 31 12:12:27 2008//TDRUPAL-5--8-0
+/og_views.inc/1.12.2.55.2.4/Mon Oct  6 07:56:45 2008//TDRUPAL-5--8-0
+/og_workflow_ng.inc/1.1.2.4/Thu Jul 31 20:08:16 2008//TDRUPAL-5--8-0
+/og_xmlrpc.inc/1.1.4.4/Mon May 26 14:03:35 2008//TDRUPAL-5--8-0
+/opml.gif/1.1.2.2/Sun Nov 19 13:14:01 2006/-kb/TDRUPAL-5--8-0
+/user-multiple.png/1.1.2.2/Wed Mar 19 05:56:40 2008/-kb/TDRUPAL-5--8-0

trunk/sites/all/modules/og/CVS/Tag

@@ -1 @@
-NDRUPAL-5--8-0-RC1
+NDRUPAL-5--8-0

trunk/sites/all/modules/og/includes/CVS/Entries

@@ -1 @@
-/groupcontent.inc/1.1.2.11/Mon May 26 14:03:35 2008//TDRUPAL-5--8-0-RC1
-/groupcontext.inc/1.1.2.4/Mon May 26 14:03:35 2008//TDRUPAL-5--8-0-RC1
-/grouprelationships.inc/1.1.2.3/Mon Mar 24 21:34:55 2008//TDRUPAL-5--8-0-RC1
+/groupcontent.inc/1.1.2.11/Mon May 26 14:03:35 2008//TDRUPAL-5--8-0
+/groupcontext.inc/1.1.2.4/Mon May 26 14:03:35 2008//TDRUPAL-5--8-0
+/grouprelationships.inc/1.1.2.3/Mon Mar 24 21:34:55 2008//TDRUPAL-5--8-0
 D

trunk/sites/all/modules/og/includes/CVS/Tag

@@ -1 @@
-NDRUPAL-5--8-0-RC1
+NDRUPAL-5--8-0

trunk/sites/all/modules/og/og.module

@@ -1 +1 @@
 <?php
-// $Id: og.module,v 1.298.2.197.2.15 2008/11/02 20:30:45 weitzman Exp $
+// $Id: og.module,v 1.298.2.197.2.18 2008/12/30 16:34:33 weitzman Exp $
 
 // Selective groups states. chosen by the group admin
@@ -75 +75 @@
     if ($group_node = og_get_group_context()) {
       if ($user->uid || variable_get('cache', CACHE_DISABLED) == CACHE_DISABLED) {
-        $_SESSION['og_last'] = og_get_group_context();
+        $_SESSION['og_last'] = $group_node->nid;
       }
     }
@@ -281 +281 @@
         // node is in multiple groups. preference goes to the group we showed on the prior page view (if any),
         // then to a group the current user is a member of
-        if (in_array($_SESSION['og_last']->nid, $node->og_groups)) {
-          $group_node = node_load($_SESSION['og_last']->nid);
+        if (in_array($_SESSION['og_last'], $node->og_groups)) {
+          $group_node = node_load($_SESSION['og_last']);
           $custom_theme = $group_node->og_theme;
         }
@@ -1032 +1032 @@
   $content .= '</table>';
   
-  if ($content) {
+  if ($total) {
     return $content;
   }
@@ -2186 +2186 @@
         $l3[] = array('title' => t('Feed'), 'href' => 'group/tracker/feed');
         $l3[] = array('title' => t('Page'), 'href' => 'group/tracker');
-        $links['all_posts'] = array('data' => t('All posts:') .' '. theme('links', $l3, $inline));
+        $links['all_posts'] = t('All posts:') .' '. theme('links', $l3, $inline);
         $content .= theme('item_list', $links);
       }

trunk/sites/all/modules/og/og_notifications/CVS/Entries

@@ -1 @@
-/README.txt/1.1.2.4/Tue Nov  4 18:55:47 2008//TDRUPAL-5--8-0-RC1
-/og_notifications.info/1.1.2.1.2.2/Thu Oct  2 18:48:15 2008//TDRUPAL-5--8-0-RC1
-/og_notifications.install/1.1.2.10/Tue Nov  4 12:07:27 2008//TDRUPAL-5--8-0-RC1
-/og_notifications.module/1.1.2.2.2.14/Tue Nov  4 18:25:14 2008//TDRUPAL-5--8-0-RC1
-D
+D/po////
+/README.txt/1.1.2.4/Tue Nov  4 18:55:47 2008//TDRUPAL-5--8-0
+/og_notifications.info/1.1.2.1.2.2/Thu Oct  2 18:48:15 2008//TDRUPAL-5--8-0
+/og_notifications.install/1.1.2.10/Tue Nov  4 12:07:27 2008//TDRUPAL-5--8-0
+/og_notifications.module/1.1.2.2.2.14/Tue Nov  4 18:25:14 2008//TDRUPAL-5--8-0

trunk/sites/all/modules/og/og_notifications/CVS/Tag

@@ -1 @@
-NDRUPAL-5--8-0-RC1
+NDRUPAL-5--8-0

trunk/sites/all/modules/og/og_notifications/po/CVS/Entries

@@ -1 @@
-/og_notifications-module.po/1.1.2.2/Sun Jul 13 17:14:43 2008//TDRUPAL-5--8-0-RC1
-/og_notifications-module.pot/1.1.2.1/Fri Jul  4 08:31:14 2008//TDRUPAL-5--8-0-RC1
+/og_notifications-module.po/1.1.2.2/Sun Jul 13 17:14:43 2008//TDRUPAL-5--8-0
+/og_notifications-module.pot/1.1.2.1/Fri Jul  4 08:31:14 2008//TDRUPAL-5--8-0
 D

trunk/sites/all/modules/og/og_notifications/po/CVS/Tag

@@ -1 @@
-NDRUPAL-5--8-0-RC1
+NDRUPAL-5--8-0

trunk/sites/all/modules/og/po/CVS/Entries

@@ -1 @@
-/ca.po/1.1.4.2/Sun Nov 19 13:14:02 2006//TDRUPAL-5--8-0-RC1
-/da.po/1.2.2.2/Sun Nov 19 13:14:02 2006//TDRUPAL-5--8-0-RC1
-/de.po/1.3.2.9/Sun Jul 13 18:00:20 2008//TDRUPAL-5--8-0-RC1
-/es.po/1.2.2.3/Wed Jan  9 05:16:13 2008//TDRUPAL-5--8-0-RC1
-/fr-CA.po/1.1.4.2/Sun Nov 19 13:14:02 2006//TDRUPAL-5--8-0-RC1
-/fr-FR.po/1.1.4.2/Sun Nov 19 13:14:02 2006//TDRUPAL-5--8-0-RC1
-/he.po/1.1.2.1/Mon Jun 11 16:54:38 2007//TDRUPAL-5--8-0-RC1
-/hu.po/1.1.2.1/Sun Jan 14 16:38:39 2007//TDRUPAL-5--8-0-RC1
-/it.po/1.1.2.2/Sun Nov 19 13:14:02 2006//TDRUPAL-5--8-0-RC1
-/og.pot/1.2.2.2/Sat Jul 12 18:30:54 2008//TDRUPAL-5--8-0-RC1
-/patch/1.1.2.1/Sun Nov 19 13:14:02 2006//TDRUPAL-5--8-0-RC1
-/sk.po/1.1.2.1/Mon Jul 16 21:28:10 2007//TDRUPAL-5--8-0-RC1
+/ca.po/1.1.4.2/Sun Nov 19 13:14:02 2006//TDRUPAL-5--8-0
+/da.po/1.2.2.2/Sun Nov 19 13:14:02 2006//TDRUPAL-5--8-0
+/de.po/1.3.2.9/Sun Jul 13 18:00:20 2008//TDRUPAL-5--8-0
+/es.po/1.2.2.3/Wed Jan  9 05:16:13 2008//TDRUPAL-5--8-0
+/fr-CA.po/1.1.4.2/Sun Nov 19 13:14:02 2006//TDRUPAL-5--8-0
+/fr-FR.po/1.1.4.2/Sun Nov 19 13:14:02 2006//TDRUPAL-5--8-0
+/he.po/1.1.2.1/Mon Jun 11 16:54:38 2007//TDRUPAL-5--8-0
+/hu.po/1.1.2.1/Sun Jan 14 16:38:39 2007//TDRUPAL-5--8-0
+/it.po/1.1.2.2/Sun Nov 19 13:14:02 2006//TDRUPAL-5--8-0
+/og.pot/1.2.2.2/Sat Jul 12 18:30:54 2008//TDRUPAL-5--8-0
+/patch/1.1.2.1/Sun Nov 19 13:14:02 2006//TDRUPAL-5--8-0
+/sk.po/1.1.2.1/Mon Jul 16 21:28:10 2007//TDRUPAL-5--8-0
 D

trunk/sites/all/modules/og/po/CVS/Tag

@@ -1 @@
-NDRUPAL-5--8-0-RC1
+NDRUPAL-5--8-0

trunk/sites/all/modules/og/tests/CVS/Entries

@@ -1 @@
-/og_post.test/1.4.2.5/Thu Apr 17 01:24:42 2008//TDRUPAL-5--8-0-RC1
-/og_subscribe.test/1.4.2.9/Sun Apr 20 21:21:19 2008//TDRUPAL-5--8-0-RC1
-/og_testcase.php/1.3.2.3/Thu Apr 17 01:24:42 2008//TDRUPAL-5--8-0-RC1
+/og_post.test/1.4.2.5/Thu Apr 17 01:24:42 2008//TDRUPAL-5--8-0
+/og_subscribe.test/1.4.2.9/Sun Apr 20 21:21:19 2008//TDRUPAL-5--8-0
+/og_testcase.php/1.3.2.3/Thu Apr 17 01:24:42 2008//TDRUPAL-5--8-0
 D

trunk/sites/all/modules/og/tests/CVS/Tag

@@ -1 @@
-NDRUPAL-5--8-0-RC1
+NDRUPAL-5--8-0

@@ -1 @@
-/branches/kester/current/sites/all/modules/og:126-131
+/branches/kester/current/sites/all/modules/og:126-131,189
 /external/current/sites/all/modules/messaging/og:130
-/external/current/sites/all/modules/og:127,129
+/external/current/sites/all/modules/og:127,129,188