Index: journal.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/journal/journal.module,v
retrieving revision 1.5.2.4
diff -u -p -r1.5.2.4 journal.module
--- journal.module	25 Feb 2008 00:32:28 -0000	1.5.2.4
+++ journal.module	19 Apr 2008 16:21:52 -0000
@@ -183,14 +183,12 @@ function journal_view() {
  * @todo Add XML output format.
  */
 function journal_output($journal, $header = array(), $format = 'html') {
-  $type = gettype($journal);
-  
   switch ($format) {
     case 'text':
       // Output delimiter in first line, since this may chance.
       $output = '\t' . "\n";
       
-      while ($entry = ($type == 'resource' ? db_fetch_object($journal) : array_shift($journal))) {
+      while ($entry = (is_array($journal) ? array_shift($journal) : db_fetch_object($journal))) {
         $row = array(
           $entry->timestamp,
           $entry->uid,
@@ -203,7 +201,7 @@ function journal_output($journal, $heade
       
     case 'html':
     default:
-      while ($entry = ($type == 'resource' ? db_fetch_object($journal) : array_shift($journal))) {
+      while ($entry = (is_array($journal) ? array_shift($journal) : db_fetch_object($journal))) {
         $rows[] = array(
           format_date($entry->timestamp, 'small'),
           theme('username', $entry),