Changeset 15355

Timestamp:

06/30/2010 12:05:18 AM (14 years ago)

Author:

dd32

Message:

Alot more tabs. Props jacobsantos & Viper007bond. See #14147

Location:

trunk/wp-includes

Files:

• capabilities.php (modified) (1 diff)
• category-template.php (modified) (1 diff)
• comment-template.php (modified) (2 diffs)
• cron.php (modified) (1 diff)
• formatting.php (modified) (1 diff)
• functions.php (modified) (3 diffs)
• general-template.php (modified) (1 diff)
• link-template.php (modified) (1 diff)
• post-thumbnail-template.php (modified) (1 diff)
• post.php (modified) (2 diffs)
• taxonomy.php (modified) (1 diff)
• user.php (modified) (1 diff)
• wp-db.php (modified) (1 diff)

trunk/wp-includes/capabilities.php

@@ -1080 +1080 @@
     $current_user = wp_get_current_user();
 
-    if ( is_multisite() && is_super_admin() )
+    if ( is_multisite() && is_super_admin() )
         return true;
 

trunk/wp-includes/category-template.php

@@ -732 +732 @@
     endswitch;
 
-    if ( $filter )
+    if ( $filter )
         return apply_filters( 'wp_generate_tag_cloud', $return, $tags, $args );
-    else
+    else
         return $return;
 }

trunk/wp-includes/comment-template.php

@@ -679 +679 @@
  */
 function comment_type($commenttxt = false, $trackbacktxt = false, $pingbacktxt = false) {
-    if ( false === $commenttxt ) $commenttxt = _x( 'Comment', 'noun' );
-    if ( false === $trackbacktxt ) $trackbacktxt = __( 'Trackback' );
-    if ( false === $pingbacktxt ) $pingbacktxt = __( 'Pingback' );
+    if ( false === $commenttxt ) $commenttxt = _x( 'Comment', 'noun' );
+    if ( false === $trackbacktxt ) $trackbacktxt = __( 'Trackback' );
+    if ( false === $pingbacktxt ) $pingbacktxt = __( 'Pingback' );
     $type = get_comment_type();
     switch( $type ) {
@@ -947 +947 @@
     global $id, $wpcommentspopupfile, $wpcommentsjavascript;
 
-    if ( false === $zero ) $zero = __( 'No Comments' );
-    if ( false === $one ) $one = __( '1 Comment' );
-    if ( false === $more ) $more = __( '% Comments' );
-    if ( false === $none ) $none = __( 'Comments Off' );
+    if ( false === $zero ) $zero = __( 'No Comments' );
+    if ( false === $one ) $one = __( '1 Comment' );
+    if ( false === $more ) $more = __( '% Comments' );
+    if ( false === $none ) $none = __( 'Comments Off' );
 
     $number = get_comments_number( $id );

trunk/wp-includes/cron.php

@@ -91 +91 @@
     $now = time();
 
-    if ( $timestamp >= $now )
-        $timestamp = $now + $interval;
-    else
-        $timestamp = $now + ($interval - (($now - $timestamp) % $interval));
+    if ( $timestamp >= $now )
+        $timestamp = $now + $interval;
+    else
+        $timestamp = $now + ($interval - (($now - $timestamp) % $interval));
 
     wp_schedule_event( $timestamp, $recurrence, $hook, $args );

trunk/wp-includes/formatting.php

@@ -2827 +2827 @@
  */
 function capital_P_dangit( $text ) {
-       return str_replace( 'Wordpress', 'WordPress', $text );
+    return str_replace( 'Wordpress', 'WordPress', $text );
 }
 

trunk/wp-includes/functions.php

@@ -670 +670 @@
     global $_wp_using_ext_object_cache;
 
-    do_action( 'delete_transient_' . $transient, $transient );
+    do_action( 'delete_transient_' . $transient, $transient );
 
     if ( $_wp_using_ext_object_cache ) {
@@ -758 +758 @@
     global $_wp_using_ext_object_cache;
 
-    $value = apply_filters( 'pre_set_transient_' . $transient, $value );
+    $value = apply_filters( 'pre_set_transient_' . $transient, $value );
 
     if ( $_wp_using_ext_object_cache ) {
@@ -3785 +3785 @@
     global $_wp_using_ext_object_cache;
 
-    $value = apply_filters( 'pre_set_site_transient_' . $transient, $value );
+    $value = apply_filters( 'pre_set_site_transient_' . $transient, $value );
 
     if ( $_wp_using_ext_object_cache ) {

trunk/wp-includes/general-template.php

@@ -1543 +1543 @@
  * @param string $before Optional Output before the date.
  * @param string $after Optional Output after the date.
-  */
+ */
 function the_weekday_date($before='',$after='') {
     global $wp_locale, $post, $day, $previousweekday;

trunk/wp-includes/link-template.php

@@ -2229 +2229 @@
  */
 function wp_shortlink_header() {
-    if ( headers_sent() )
+    if ( headers_sent() )
         return;
 

trunk/wp-includes/post-thumbnail-template.php

@@ -58 +58 @@
  * @param string $size Optional. Image size.  Defaults to 'thumbnail'.
  * @param string|array $attr Optional. Query string or array of attributes.
-  */
+ */
 function get_the_post_thumbnail( $post_id = NULL, $size = 'post-thumbnail', $attr = '' ) {
     global $id;

trunk/wp-includes/post.php

@@ -3506 +3506 @@
             $del_file = path_join( dirname($meta['file']), $size['file'] );
             $del_file = apply_filters('wp_delete_file', $del_file);
-            @ unlink( path_join($uploadpath['basedir'], $del_file) );
+            @ unlink( path_join($uploadpath['basedir'], $del_file) );
         }
     }
@@ -3579 +3579 @@
             if ( 0 === strpos($file, $uploads['basedir']) ) //Check that the upload base exists in the file location
                 $url = str_replace($uploads['basedir'], $uploads['baseurl'], $file); //replace file location with url location
-            elseif ( false !== strpos($file, 'wp-content/uploads') )
-                $url = $uploads['baseurl'] . substr( $file, strpos($file, 'wp-content/uploads') + 18 );
-            else
-                $url = $uploads['baseurl'] . "/$file"; //Its a newly uploaded file, therefor $file is relative to the basedir.
+            elseif ( false !== strpos($file, 'wp-content/uploads') )
+                $url = $uploads['baseurl'] . substr( $file, strpos($file, 'wp-content/uploads') + 18 );
+            else
+                $url = $uploads['baseurl'] . "/$file"; //Its a newly uploaded file, therefor $file is relative to the basedir.
         }
     }

trunk/wp-includes/taxonomy.php

@@ -982 +982 @@
     $selects = array();
     switch ( $fields ) {
-        case 'all':
-            $selects = array('t.*', 'tt.*');
-            break;
-        case 'ids':
+        case 'all':
+            $selects = array('t.*', 'tt.*');
+            break;
+        case 'ids':
         case 'id=>parent':
-            $selects = array('t.term_id', 'tt.parent', 'tt.count');
-            break;
-        case 'names':
-            $selects = array('t.term_id', 'tt.parent', 'tt.count', 't.name');
-            break;
-        case 'count':
+            $selects = array('t.term_id', 'tt.parent', 'tt.count');
+            break;
+        case 'names':
+            $selects = array('t.term_id', 'tt.parent', 'tt.count', 't.name');
+            break;
+        case 'count':
             $orderby = '';
             $order = '';
-            $selects = array('COUNT(*)');
-    }
-    $select_this = implode(', ', apply_filters( 'get_terms_fields', $selects, $args ));
+            $selects = array('COUNT(*)');
+    }
+    $select_this = implode(', ', apply_filters( 'get_terms_fields', $selects, $args ));
 
     $query = "SELECT $select_this FROM $wpdb->terms AS t INNER JOIN $wpdb->term_taxonomy AS tt ON t.term_id = tt.term_id WHERE tt.taxonomy IN ($in_taxonomies) $where $orderby $order $limit";

trunk/wp-includes/user.php

@@ -753 +753 @@
     }
 
-    $metas = get_user_metavalues($ids);
+    $metas = get_user_metavalues($ids);
 
     foreach($users as $user_object) {
         if (isset($metas[$user_object->ID])) {
-            _fill_single_user($user_object, $metas[$user_object->ID]);
+            _fill_single_user($user_object, $metas[$user_object->ID]);
         }
     }

trunk/wp-includes/wp-db.php

@@ -791 +791 @@
      * Escape data. Works on arrays.
      *
-     * @uses wpdb::_escape()
-     * @uses wpdb::_real_escape()
+     * @uses wpdb::_escape()
+     * @uses wpdb::_real_escape()
      * @since  2.8
      * @access private