Changeset 1100 for trunk/common

Timestamp:

12/28/09 15:20:20 (2 years ago)

Author:

bogdan2412

Message:

Updated database dump

Updated db-strip script to remove user's remote ip information and also cleanup
entries previously left orphan in ia_user_round, ia_round_task and in
ia_*_tags. Also made it erase more useless stuff from the forum while keeping
more users, more jobs and more textblock history.

The total size of the dump is actually smaller now, even though it has more
relevant data.

Also fixed a bug in textblock_grep which caused the grep macro to stop working.

File:

• trunk/common/db/textblock.php (modified) (2 diffs)

trunk/common/db/textblock.php

@@ -244 +244 @@
 // Grep through textblocks. This is mostly a hack needed for macro_grep.php
 // Also used for round deletion
-function textblock_grep($substr, $page, $regexp = false, $offset = 0, $count = 0) {
+function textblock_grep($substr, $page, $regexp = false, $offset = null, $count = null) {
     if (!$regexp) {
         $compare = "LIKE";
@@ -256 +256 @@
                       WHERE `name` LIKE '%s' AND
                             (`text` $compare '%s' OR `title` $compare '%s')
-                      ORDER BY `name`
-                      LIMIT %s, %s",
-                      db_escape($page), db_escape($substr), db_escape($substr),
-                      db_escape($offset), db_escape($count));
+                      ORDER BY `name`",
+                      db_escape($page), db_escape($substr), db_escape($substr));
+
+    if (is_whole_number($offset) && is_whole_number($count)) {
+        $query .= sprintf(" LIMIT %s, %s",
+                          db_escape($offset), db_escape($count));
+    }
     return db_fetch_all($query);
 }