Index: themes.php
===================================================================
--- themes.php	(revision 15432)
+++ themes.php	(working copy)
@@ -9,6 +9,12 @@
 /** WordPress Administration Bootstrap */
 require_once('./admin.php');
 
+if ( isset( $_GET['pagenum'] ) )
+	$page = absint( $_GET['pagenum'] );
+
+if ( empty($page) )
+	$page = 1;
+
 if ( !current_user_can('switch_themes') && !current_user_can('edit_theme_options') )
 	wp_die( __( 'Cheatin’ uh?' ) );
 
@@ -16,7 +22,12 @@
 	if ( 'activate' == $_GET['action'] ) {
 		check_admin_referer('switch-theme_' . $_GET['template']);
 		switch_theme($_GET['template'], $_GET['stylesheet']);
-		wp_redirect('themes.php?activated=true');
+		
+		$activate_link_page = '';
+		if ( $page > 1 )
+			$activate_link_page = '&pagenum='.$page;
+			
+		wp_redirect('themes.php?activated=true'.$activate_link_page);
 		exit;
 	} else if ( 'delete' == $_GET['action'] ) {
 		check_admin_referer('delete-theme_' . $_GET['template']);
@@ -74,12 +85,6 @@
 $theme_total = count( $themes );
 $per_page = 15;
 
-if ( isset( $_GET['pagenum'] ) )
-	$page = absint( $_GET['pagenum'] );
-
-if ( empty($page) )
-	$page = 1;
-
 $start = $offset = ( $page - 1 ) * $per_page;
 
 $page_links = paginate_links( array(
@@ -188,7 +193,10 @@
 	$preview_text = esc_attr( sprintf( __('Preview of “%s”'), $title ) );
 	$tags = $themes[$theme_name]['Tags'];
 	$thickbox_class = 'thickbox thickbox-preview';
-	$activate_link = wp_nonce_url("themes.php?action=activate&template=".urlencode($template)."&stylesheet=".urlencode($stylesheet), 'switch-theme_' . $template);
+	$activate_link_page = '';
+	if ( $page > 1 )
+		$activate_link_page = '&pagenum='.$page;
+	$activate_link = wp_nonce_url("themes.php?action=activate&template=".urlencode($template)."&stylesheet=".urlencode($stylesheet).$activate_link_page, 'switch-theme_' . $template);
 	$activate_text = esc_attr( sprintf( __('Activate “%s”'), $title ) );
 	$actions = array();
 	$actions[] = '<a href="' . $activate_link .  '" class="activatelink" title="' . $activate_text . '">' . __('Activate') . '</a>';