? dblog.302268.6.patch
Index: modules/dblog/dblog.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/dblog/dblog.admin.inc,v
retrieving revision 1.13
diff -u -p -r1.13 dblog.admin.inc
--- modules/dblog/dblog.admin.inc	26 Feb 2009 07:30:26 -0000	1.13
+++ modules/dblog/dblog.admin.inc	7 Mar 2009 17:49:20 -0000
@@ -132,8 +132,9 @@ function dblog_top($type) {
 function dblog_event($id) {
   $severity = watchdog_severity_levels();
   $output = '';
-  $result = db_query('SELECT w.*, u.name, u.uid FROM {watchdog} w INNER JOIN {users} u ON w.uid = u.uid WHERE w.wid = %d', $id);
-  if ($dblog = db_fetch_object($result)) {
+  $dblog = db_query("SELECT w.*, u.name, u.uid FROM {watchdog} w INNER JOIN {users} u ON w.uid = u.uid WHERE w.wid = :wid", array(':wid' => $id))->fetchObject();
+
+  if ($dblog) {
     $rows = array(
       array(
         array('data' => t('Type'), 'header' => TRUE),
Index: modules/dblog/dblog.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/dblog/dblog.module,v
retrieving revision 1.35
diff -u -p -r1.35 dblog.module
--- modules/dblog/dblog.module	25 Jan 2009 12:19:31 -0000	1.35
+++ modules/dblog/dblog.module	7 Mar 2009 17:49:20 -0000
@@ -97,8 +97,8 @@ function dblog_init() {
  */
 function dblog_cron() {
   // Cleanup the watchdog table
-  $max = db_result(db_query('SELECT MAX(wid) FROM {watchdog}'));
-  db_query('DELETE FROM {watchdog} WHERE wid <= %d', $max - variable_get('dblog_row_limit', 1000));
+  $max = db_query('SELECT MAX(wid) FROM {watchdog}')->fetchObject();
+  db_delete('watchdog')->condition('wid', $max - variable_get('dblog_row_limit', 1000), '<=')->execute();
 }
 
 /**
@@ -118,9 +118,8 @@ function dblog_user_cancel($edit, $accou
 
 function _dblog_get_message_types() {
   $types = array();
-
-  $result = db_query('SELECT DISTINCT(type) FROM {watchdog} ORDER BY type');
-  while ($object = db_fetch_object($result)) {
+  $results = db_query('SELECT DISTINCT(type) FROM {watchdog} ORDER BY type')->fetchAll();
+  foreach ($results AS $object) {
     $types[] = $object->type;
   }