[geeklog-cvs] Geeklog-1.x/plugins/calendar functions.inc, 1.92, 1.93

[Dirk Haun]

Update of /cvsroot/geeklog/Geeklog-1.x/plugins/calendar
In directory qs1489.pair.com:/tmp/cvs-serv61586/plugins/calendar

Modified Files:
	functions.inc 
Log Message:
Search for author didn't work


Index: functions.inc
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/plugins/calendar/functions.inc,v
retrieving revision 1.92
retrieving revision 1.93
diff -C2 -d -r1.92 -r1.93
*** functions.inc	3 Jul 2008 18:00:50 -0000	1.92
--- functions.inc	6 Jul 2008 20:16:59 -0000	1.93
***************
*** 940,945 ****
  *
  */
! function CALENDAR_deleteOld() {
      global $_CONF, $LANG_CAL_ADMIN;
      $msg = '';
      $event_list = array();
--- 940,947 ----
  *
  */
! function CALENDAR_deleteOld()
! {
      global $_CONF, $LANG_CAL_ADMIN;
+ 
      $msg = '';
      $event_list = array();
***************
*** 962,969 ****
          }
      }
      // Since this function is used for deletion only, its necessary to say that
      // zero were deleted instead of just leaving this message away.
!     COM_numberFormat($c); // just in case we have more than 999)..
      $msg .= "{$LANG_CAL_ADMIN[36]}: $c<br" . XHTML . ">\n";
      return $msg;
  }
--- 964,973 ----
          }
      }
+ 
      // Since this function is used for deletion only, its necessary to say that
      // zero were deleted instead of just leaving this message away.
!     COM_numberFormat($c); // just in case we have more than 999 ...
      $msg .= "{$LANG_CAL_ADMIN[36]}: $c<br" . XHTML . ">\n";
+ 
      return $msg;
  }
***************
*** 1635,1638 ****
--- 1639,1645 ----
          }
      }
+     if (!empty($author)) {
+         $sql .= "AND (owner_id = '$author')";
+     }
      $sql .= COM_getPermSQL ('AND');
      $sql .= ' GROUP BY datestart, eid, title, description, location, dateend, timestart, timeend, allday, event_type ORDER BY datestart DESC ';