Changeset 2481

Timestamp:

03/28/2005 02:34:16 AM (20 years ago)

Author:

ryan

Message:

Add paging to Manage->Posts. ​http://mosquito.wordpress.org/view.php?id=1177

Location:

trunk

Files:

• wp-admin/edit.php (modified) (3 diffs)
• wp-admin/wp-admin.css (modified) (2 diffs)
• wp-includes/functions.php (modified) (1 diff)
• wp-includes/template-functions-links.php (modified) (1 diff)

trunk/wp-admin/edit.php

@@ -67 +67 @@
 <h2>
 <?php
-if ( $_GET['m'] ) {
-    echo $month[substr( $_GET['m'], 4, 2 )] . ' ' . substr( $_GET['m'], 0, 4 );
-} elseif ( isset( $_GET['s'] ) ) {
+$what_to_show = 'posts';
+$posts_per_page = 15;
+$posts_per_archive_page = -1;
+
+include(ABSPATH.'wp-blog-header.php');
+
+if ( is_month() ) {
+    single_month_title(' ');
+} elseif ( is_search() ) {
     printf(__('Search for &#8220;%s&#8221;'), wp_specialchars($_GET['s']) );
 } else {
-    _e('Last 15 Posts');
+    if ( ! is_paged() || get_query_var('paged') == 1 )
+        _e('Last 15 Posts');
+    else
+        _e('Previous Posts');
 }
 ?>
@@ -141 +150 @@
     </tr>
 <?php
-$what_to_show = 'posts';
-if ( empty($_GET['m']) || 0 == $_GET['m'] && empty($_GET['s']) ) {
-  $showposts = 15;
-} else {
-  $nopaging = true;
-}
-
-include(ABSPATH.'wp-blog-header.php');
-
 if ($posts) {
 $bgcolor = '';
@@ -239 +239 @@
 ?> 
 </table> 
+
+<div class="navigation">
+<div class="alignleft"><?php next_posts_link(__('&laquo; Previous Entries')) ?></div>
+<div class="alignright"><?php previous_posts_link(__('Next Entries &raquo;')) ?></div>
+</div>
+
 <?php
 if ( 1 == count($posts) ) {

trunk/wp-admin/wp-admin.css

@@ -142 +142 @@
 }
 
+.alignleft {
+    float: left
+}
+
+.alignright {
+    float: right;
+}
+
 .alternate {
     background: #eee;
@@ -172 +180 @@
 .hidden {
     display: none;
+}
+
+.navigation {
+    display: block;
+    text-align: center;
+    margin-top: 10px;
+    margin-bottom: 30px;
 }
 

trunk/wp-includes/functions.php

@@ -1396 +1396 @@
 }
 
+function is_admin () {
+    global $wp_query;
+
+    return $wp_query->is_admin;
+}
+
 function is_home () {
     global $wp_query;

trunk/wp-includes/template-functions-links.php

@@ -369 +369 @@
 }
 
-function get_pagenum_link($pagenum = 1){
+function get_pagenum_link($pagenum = 1) {
     global $wp_rewrite;
 
-   $qstr = $_SERVER['REQUEST_URI'];
-
-   $page_querystring = "paged"; 
-   $page_modstring = "page/";
-   $page_modregex = "page/?";
-   $permalink = 0;
-     $index = 'index.php';
-
-     $home_root = parse_url(get_settings('home'));
-     $home_root = $home_root['path'];
-   $home_root = trailingslashit($home_root);
-   $qstr = preg_replace('|^'. $home_root . '|', '', $qstr);
-   $qstr = preg_replace('|^/+|', '', $qstr);
-
-   // if we already have a QUERY style page string
-   if( stristr( $qstr, $page_querystring ) ) {
-       $replacement = "$page_querystring=$pagenum";
-      $qstr = preg_replace("/".$page_querystring."[^\d]+\d+/", $replacement, $qstr);
-   // if we already have a mod_rewrite style page string
-   } elseif ( preg_match( '|'.$page_modregex.'\d+|', $qstr ) ){
-      $permalink = 1;
-      $qstr = preg_replace('|'.$page_modregex.'\d+|',"$page_modstring$pagenum",$qstr);
-
-   // if we don't have a page string at all ...
-   // lets see what sort of URL we have...
-   } else {
-      // we need to know the way queries are being written
-      // if there's a querystring_start (a "?" usually), it's deffinitely not mod_rewritten
-      if ( stristr( $qstr, '?' ) ){
-         // so append the query string (using &, since we already have ?)
-         $qstr .=  '&' . $page_querystring . '=' . $pagenum;
-         // otherwise, it could be rewritten, OR just the default index ...
-      } elseif( '' != get_settings('permalink_structure')) {
-         $permalink = 1;
-
-     // If it's not a path info permalink structure, trim the index.
-     if (! $wp_rewrite->using_index_permalinks()) {
-       $qstr = preg_replace("#/*" . $index . "/*#", '/', $qstr);
-     } else {
-       // If using path info style permalinks, make sure the index is in
-       // the URI.
-       if (strpos($qstr, $index) === false) {
-         $qstr = '/' . $index . $qstr;
-       }
-     }
-
-     $qstr =  trailingslashit($qstr) . $page_modstring . $pagenum;
-      } else {
-         $qstr = $index . '?' . $page_querystring . '=' . $pagenum;
-      }
-   }
-
-   $qstr = preg_replace('|^/+|', '', $qstr);
-   if ($permalink) $qstr = trailingslashit($qstr);
-   return preg_replace('/&([^#])(?![a-z]{1,8};)/', '&$1', trailingslashit( get_settings('home') ) . $qstr );
+    $qstr = $_SERVER['REQUEST_URI'];
+
+    $page_querystring = "paged"; 
+    $page_modstring = "page/";
+    $page_modregex = "page/?";
+    $permalink = 0;
+    //$index = 'index.php';
+    $index = $_SERVER['SCRIPT_NAME'];
+
+    $home_root = parse_url(get_settings('home'));
+    $home_root = $home_root['path'];
+    $home_root = trailingslashit($home_root);
+    $qstr = preg_replace('|^'. $home_root . '|', '', $qstr);
+    $qstr = preg_replace('|^/+|', '', $qstr);
+
+    // if we already have a QUERY style page string
+    if( stristr( $qstr, $page_querystring ) ) {
+        $replacement = "$page_querystring=$pagenum";
+        $qstr = preg_replace("/".$page_querystring."[^\d]+\d+/", $replacement, $qstr);
+        // if we already have a mod_rewrite style page string
+    } elseif ( preg_match( '|'.$page_modregex.'\d+|', $qstr ) ){
+        $permalink = 1;
+        $qstr = preg_replace('|'.$page_modregex.'\d+|',"$page_modstring$pagenum",$qstr);
+
+        // if we don't have a page string at all ...
+        // lets see what sort of URL we have...
+    } else {
+        // we need to know the way queries are being written
+        // if there's a querystring_start (a "?" usually), it's definitely not mod_rewritten
+        if ( stristr( $qstr, '?' ) ){
+            // so append the query string (using &, since we already have ?)
+            $qstr .=  '&' . $page_querystring . '=' . $pagenum;
+            // otherwise, it could be rewritten, OR just the default index ...
+        } elseif( '' != get_settings('permalink_structure') && ! is_admin()) {
+            $permalink = 1;
+            $index = $wp_rewrite->index;
+            // If it's not a path info permalink structure, trim the index.
+            if (! $wp_rewrite->using_index_permalinks()) {
+                $qstr = preg_replace("#/*" . $index . "/*#", '/', $qstr);
+            } else {
+                // If using path info style permalinks, make sure the index is in
+                // the URI.
+                if (strpos($qstr, $index) === false) {
+                    $qstr = '/' . $index . $qstr;
+                }
+            }
+
+            $qstr =  trailingslashit($qstr) . $page_modstring . $pagenum;
+        } else {
+            $qstr = $index . '?' . $page_querystring . '=' . $pagenum;
+        }
+    }
+
+    $qstr = preg_replace('|^/+|', '', $qstr);
+    if ($permalink) $qstr = trailingslashit($qstr);
+    return preg_replace('/&([^#])(?![a-z]{1,8};)/', '&$1', trailingslashit( get_settings('home') ) . $qstr );
 }