Changes in branches/2.2/wp-includes/general-template.php [5443:5714]

File:

• branches/2.2/wp-includes/general-template.php (modified) (8 diffs)

branches/2.2/wp-includes/general-template.php

@@ -64 +64 @@
     
     // Don't filter URL's.
-    if (strpos($show, 'url') === false || 
-        strpos($show, 'directory') === false || 
+    if (strpos($show, 'url') === false &&
+        strpos($show, 'directory') === false &&
         strpos($show, 'home') === false) {
         $info = apply_filters('bloginfo', $info, $show);
@@ -110 +110 @@
         case 'comments_atom_url':
             $output = get_feed_link('comments_atom');
+            break;
         case 'comments_rss2_url':
             $output = get_feed_link('comments_rss2');
@@ -218 +219 @@
     if ( is_single() || is_page() ) {
         $post = $wp_query->get_queried_object();
-        $title = apply_filters('single_post_title', $title);
-        $title = strip_tags($post->post_title);
+        $title = strip_tags( apply_filters( 'single_post_title', $post->post_title ) );
     }
 
@@ -323 +323 @@
     $defaults = array('type' => 'monthly', 'limit' => '', 'format' => 'html', 'before' => '', 'after' => '', 'show_post_count' => false);
     $r = array_merge($defaults, $r);
-    extract($r);
+    extract($r, EXTR_SKIP);
 
     if ( '' == $type )
@@ -900 +900 @@
     edCanvas = document.getElementById('<?php echo $id; ?>');
     <?php if ( $prev_id && user_can_richedit() ) : ?>
+    // If tinyMCE is defined.
+    if ( typeof tinyMCE != 'undefined' ) {
     // This code is meant to allow tabbing from Title to Post (TinyMCE).
-    if ( tinyMCE.isMSIE )
-        document.getElementById('<?php echo $prev_id; ?>').onkeydown = function (e)
-            {
+        if ( tinyMCE.isMSIE ) {
+            document.getElementById('<?php echo $prev_id; ?>').onkeydown = function (e) {
                 e = e ? e : window.event;
                 if (e.keyCode == 9 && !e.shiftKey && !e.controlKey && !e.altKey) {
@@ -916 +917 @@
                 }
             }
-    else
-        document.getElementById('<?php echo $prev_id; ?>').onkeypress = function (e)
-            {
+        } else {
+            document.getElementById('<?php echo $prev_id; ?>').onkeypress = function (e) {
                 e = e ? e : window.event;
                 if (e.keyCode == 9 && !e.shiftKey && !e.controlKey && !e.altKey) {
@@ -931 +931 @@
                 }
             }
+        }
+    }
     <?php endif; ?>
     //-->
@@ -956 +958 @@
 }
 
-function paginate_links( $arg = '' ) {
-    if ( is_array($arg) )
-        $a = &$arg;
-    else
-        parse_str($arg, $a);
-
-    // Defaults
-    $base = '%_%'; // http://example.com/all_posts.php%_% : %_% is replaced by format (below)
-    $format = '?page=%#%'; // ?page=%#% : %#% is replaced by the page number
-    $total = 1;
-    $current = 0;
-    $show_all = false;
-    $prev_next = true;
-    $prev_text = __('&laquo; Previous');
-    $next_text = __('Next &raquo;');
-    $end_size = 1; // How many numbers on either end including the end
-    $mid_size = 2; // How many numbers to either side of current not including current
-    $type = 'plain';
-    $add_args = false; // array of query args to aadd
-
-    extract($a);
+function paginate_links( $args = '' ) {
+    $defaults = array( 
+        'base' => '%_%', // http://example.com/all_posts.php%_% : %_% is replaced by format (below)
+        'format' => '?page=%#%', // ?page=%#% : %#% is replaced by the page number
+        'total' => 1,
+        'current' => 0,
+        'show_all' => false,
+        'prev_next' => true,
+        'prev_text' => __('&laquo; Previous'),
+        'next_text' => __('Next &raquo;'),
+        'end_size' => 1, // How many numbers on either end including the end
+        'mid_size' => 2, // How many numbers to either side of current not including current
+        'type' => 'plain',
+        'add_args' => false // array of query args to aadd
+    );
+
+    $args = wp_parse_args( $args, $defaults );
+    extract($args, EXTR_SKIP);
 
     // Who knows what else people pass in $args