# HG changeset patch
# User Dan
# Date 1272680103 14400
# Node ID 3914c9a9587912ce58ea0d07739209f4772c37f0
# Parent  30f023a13a711c4e9a513778ed50ad5989c1f4e5# Parent  62763b17be2d56685fdebbe47d8c0083a56f50e2
Merged (accidental split)

diff -r 30f023a13a71 -r 3914c9a95879 includes/wikiformat.php
--- a/includes/wikiformat.php	Fri Apr 30 22:13:08 2010 -0400
+++ b/includes/wikiformat.php	Fri Apr 30 22:15:03 2010 -0400
@@ -69,11 +69,11 @@
 			'bold',
 			'italic',
 			'underline',
+			'image',
 			'externalwithtext',
 			'externalnotext',
 			'mailtowithtext',
 			'mailtonotext',
-			'image',
 			'internallink',
 			'paragraph',
 			'blockquotepost'
diff -r 30f023a13a71 -r 3914c9a95879 plugins/SpecialPageFuncs.php
--- a/plugins/SpecialPageFuncs.php	Fri Apr 30 22:13:08 2010 -0400
+++ b/plugins/SpecialPageFuncs.php	Fri Apr 30 22:15:03 2010 -0400
@@ -323,7 +323,7 @@
 			'<div class="tblholder">
  				<table border="0" cellspacing="1" cellpadding="4">
  					<tr>',          // print at start
-			'    ' . $last_cell . '</tr>
+			'		' . $last_cell . '</tr>
  				</table>
  			</div>'             // print at end
  			);
@@ -356,12 +356,12 @@
 		}
 		echo '<td style="width: 50%;" class="' . $cclass . '">';
 		echo '<a href="' . makeUrl($cdata['urlname']) . '">';
-		echo htmlspecialchars($cdata['name']);
+		echo htmlspecialchars($lang->get($cdata['name']));
 		echo '</a>';
 		echo '</td>';
 	}
 	// close up the table if necessary
-	if ( $i % 2 > 0 )
+	if ( $i % 2 == 0 )
 	{
 		echo "<td class=\"$cclass\"></td>";
 	}