--- a/includes/pageutils.php	Sun Dec 02 15:27:21 2007 -0500
+++ b/includes/pageutils.php	Sun Dec 02 16:00:10 2007 -0500
@@ -629,8 +629,8 @@
         {
           $rc = '';
         }
-        echo '<td class="' . $cls . '"' . $rc . '><a href="'.makeUrlNS('User', $r['author']).'" ';
-        if ( !isPage($paths->nslist['User'] . $r['author']) )
+        echo '<td class="' . $cls . '"' . $rc . '><a href="'.makeUrlNS('User', sanitize_page_id($r['author'])).'" ';
+        if ( !isPage($paths->nslist['User'] . sanitize_page_id($r['author'])) )
         {
           echo 'class="wikilink-nonexistent"';
         }
@@ -697,8 +697,8 @@
         echo '<td class="' . $cls . '">' . $r['date_string'] . '</td class="' . $cls . '">';
         
         // User
-        echo '<td class="' . $cls . '"><a href="'.makeUrlNS('User', $r['author']).'" ';
-        if(!isPage($paths->nslist['User'] . $r['author'])) echo 'class="wikilink-nonexistent"';
+        echo '<td class="' . $cls . '"><a href="'.makeUrlNS('User', sanitize_page_id($r['author'])).'" ';
+        if(!isPage($paths->nslist['User'] . sanitize_page_id($r['author']))) echo 'class="wikilink-nonexistent"';
         echo '>' . $r['author'] . '</a></td class="' . $cls . '">';
         
         
@@ -1051,7 +1051,7 @@
         
         // Determine the name, and whether to link to the user page or not
         $name = '';
-        if($row['user_id'] > 1) $name .= '<a href="'.makeUrlNS('User', str_replace(' ', '_', $row['name'])).'">';
+        if($row['user_id'] > 1) $name .= '<a href="'.makeUrlNS('User', sanitize_page_id(' ', '_', $row['name'])).'">';
         $name .= $row['name'];
         if($row['user_id'] > 1) $name .= '</a>';
         $strings['NAME'] = $name; unset($name);