Pinking shears

ryanboren · ryanboren · commit 8c50f982ea97 · 2012-05-03T16:41:59.000Z
git-svn-id: https://develop.svn.wordpress.org/trunk@20715 602fd350-edb4-49c9-b593-d223f7449a82
diff --git a/wp-admin/includes/meta-boxes.php b/wp-admin/includes/meta-boxes.php
@@ -665,7 +665,7 @@ function link_categories_meta_box($link) {
 		<li class="tabs"><a href="#categories-all"><?php _e( 'All Categories' ); ?></a></li>
 		<li class="hide-if-no-js"><a href="#categories-pop"><?php _e( 'Most Used' ); ?></a></li>
 	</ul>
-	
+
 	<div id="categories-all" class="tabs-panel">
 		<ul id="categorychecklist" class="list:category categorychecklist form-no-clear">
 			<?php
@@ -676,13 +676,13 @@ function link_categories_meta_box($link) {
 			?>
 		</ul>
 	</div>
-	
+
 	<div id="categories-pop" class="tabs-panel" style="display: none;">
 		<ul id="categorychecklist-pop" class="categorychecklist form-no-clear">
 			<?php wp_popular_terms_checklist('link_category'); ?>
 		</ul>
 	</div>
-	
+
 	<div id="category-adder" class="wp-hidden-children">
 		<h4><a id="category-add-toggle" href="#category-add"><?php _e( '+ Add New Category' ); ?></a></h4>
 		<p id="link-category-add" class="wp-hidden-child">
diff --git a/wp-admin/includes/post.php b/wp-admin/includes/post.php
@@ -747,7 +747,7 @@ function update_meta( $meta_id, $meta_key, $meta_value ) {
 function _fix_attachment_links( $post_ID ) {
 	$post = & get_post( $post_ID, ARRAY_A );
 	$content = $post['post_content'];
-	
+
 	// quick sanity check, don't run if no pretty permalinks or post is not published
 	if ( !get_option('permalink_structure') || $post['post_status'] != 'publish' )
 		return;
diff --git a/wp-admin/includes/screen.php b/wp-admin/includes/screen.php
@@ -809,7 +809,7 @@ public function render_screen_meta() {
 
 		if ( $this->get_option( 'layout_columns' ) ) {
 			$this->columns = (int) get_user_option("screen_layout_$this->id");
-	
+
 			if ( ! $this->columns && $this->get_option( 'layout_columns', 'default' ) )
 				$this->columns = $this->get_option( 'layout_columns', 'default' );
 		}
diff --git a/wp-admin/includes/update.php b/wp-admin/includes/update.php
@@ -223,7 +223,7 @@ function get_theme_updates() {
 	if ( ! isset( $current->response ) )
 		return array();
 
-	$update_themes = array();	
+	$update_themes = array();
 	foreach ( $current->response as $stylesheet => $data ) {
 		$update_themes[ $stylesheet ] = wp_get_theme( $stylesheet );
 		$update_themes[ $stylesheet ]->update = $data;
diff --git a/wp-admin/index.php b/wp-admin/index.php
@@ -91,7 +91,7 @@
 	'<p>' . __( '<a href="http://codex.wordpress.org/Dashboard_Screen" target="_blank">Documentation on Dashboard</a>' ) . '</p>' .
 	'<p>' . __( '<a href="http://wordpress.org/support/" target="_blank">Support Forums</a>' ) . '</p>'
 );
-	
+
 include (ABSPATH . 'wp-admin/admin-header.php');
 
 $today = current_time('mysql', 1);
diff --git a/wp-admin/install.php b/wp-admin/install.php
@@ -163,7 +163,7 @@ function display_setup_form( $error = null ) {
 }
 
 if ( ! is_string( $wpdb->base_prefix ) || '' === $wpdb->base_prefix ) {
-	display_header();	
+	display_header();
 	die( '<h1>' . __( 'Configuration Error' ) . '</h1><p>' . __( 'Your <code>wp-config.php</code> file has an empty database table prefix, which is not supported.' ) . '</p></body></html>' );
 }
 
diff --git a/wp-includes/class-phpmailer.php b/wp-includes/class-phpmailer.php
@@ -1643,7 +1643,7 @@ function get_magic_quotes() {
         if (version_compare(PHP_VERSION, '5.3.0', '<')) {
           set_magic_quotes_runtime(0);
         } else {
-		  ini_set('magic_quotes_runtime', 0); 
+		  ini_set('magic_quotes_runtime', 0);
 		}
 	  }
       $file_buffer  = file_get_contents($path);
@@ -1652,7 +1652,7 @@ function get_magic_quotes() {
         if (version_compare(PHP_VERSION, '5.3.0', '<')) {
           set_magic_quotes_runtime($magic_quotes);
         } else {
-		  ini_set('magic_quotes_runtime', $magic_quotes); 
+		  ini_set('magic_quotes_runtime', $magic_quotes);
 	    }
 	  }
       return $file_buffer;
diff --git a/wp-includes/class-simplepie.php b/wp-includes/class-simplepie.php
@@ -2775,7 +2775,7 @@ function get_language()
 
 	function get_latitude()
 	{
-		
+
 		if ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_W3C_BASIC_GEO, 'lat'))
 		{
 			return (float) $return[0]['data'];
diff --git a/wp-includes/class-wp-atom-server.php b/wp-includes/class-wp-atom-server.php
@@ -346,7 +346,7 @@ function create_post() {
 		$post_content = '';
 		$post_excerpt = '';
 		$pubtimes     = '';
-		
+
 		if ( isset( $entry->title ) && is_array( $entry->title ) && !empty( $entry->title[1] ) )
 			$post_title = (string) $entry->title[1];
 		if ( isset( $entry->content ) && is_array( $entry->content ) && !empty( $entry->content[1] ) )
@@ -355,7 +355,7 @@ function create_post() {
 			$post_excerpt = (string) $entry->summary[1];
 		if ( !empty( $entry->published ) )
 			$pubtimes = (string) $entry->published;
-		
+
 		$pubtimes = $this->get_publish_time( $pubtimes );
 
 		$post_date = $pubtimes[0];
diff --git a/wp-includes/class-wp-theme.php b/wp-includes/class-wp-theme.php
@@ -372,7 +372,7 @@ public function offsetExists( $offset ) {
 	 * Method to implement ArrayAccess for keys formerly returned by get_themes().
 	 *
 	 * Author, Author Name, Author URI, and Description did not previously return
-	 * translated data. We are doing so now as it is safe to do. However, as 
+	 * translated data. We are doing so now as it is safe to do. However, as
 	 * Name and Title could have been used as the key for get_themes(), both remain
 	 * untranslated for back compatibility. This means that ['Name'] is not ideal,
 	 * and care should be taken to use $theme->display('Name') to get a properly
diff --git a/wp-includes/class-wp-xmlrpc-server.php b/wp-includes/class-wp-xmlrpc-server.php
@@ -3275,7 +3275,7 @@ function blogger_getPost($args) {
 		$post_data = wp_get_single_post($post_ID, ARRAY_A);
 		if ( ! $post_data )
 			return new IXR_Error( 404, __( 'Invalid post ID.' ) );
-			
+
 		if ( !current_user_can( 'edit_post', $post_ID ) )
 			return new IXR_Error( 401, __( 'Sorry, you cannot edit this post.' ) );
 
diff --git a/wp-includes/deprecated.php b/wp-includes/deprecated.php
@@ -2996,7 +2996,7 @@ function get_current_theme() {
  */
 function clean_pre($matches) {
 	_deprecated_function( __FUNCTION__, '3.4' );
-	
+
 	if ( is_array($matches) )
 		$text = $matches[1] . $matches[2] . "</pre>";
 	else
diff --git a/wp-includes/functions.php b/wp-includes/functions.php
@@ -3686,7 +3686,7 @@ function _device_can_upload() {
 		return true;
 
 	$ua = $_SERVER['HTTP_USER_AGENT'];
-	
+
 	if ( strpos($ua, 'iPhone') !== false
 		|| strpos($ua, 'iPad') !== false
 		|| strpos($ua, 'iPod') !== false ) {

Original file line number	Diff line number	Diff line change
`@@ -809,7 +809,7 @@ public function render_screen_meta() {`
`809`	`809`
`810`	`810`	`if ( $this->get_option( 'layout_columns' ) ) {`
`811`	`811`	`$this->columns = (int) get_user_option("screen_layout_$this->id");`
`812`		`-`
	`812`	`+`
`813`	`813`	`if ( ! $this->columns && $this->get_option( 'layout_columns', 'default' ) )`
`814`	`814`	`$this->columns = $this->get_option( 'layout_columns', 'default' );`
`815`	`815`	`}`
Original file line number	Diff line number	Diff line change
`@@ -163,7 +163,7 @@ function display_setup_form( $error = null ) {`
`163`	`163`	`}`
`164`	`164`
`165`	`165`	`if ( ! is_string( $wpdb->base_prefix ) \|\| '' === $wpdb->base_prefix ) {`
`166`		`- display_header();`
	`166`	`+ display_header();`
`167`	`167`	`die( '<h1>' . __( 'Configuration Error' ) . '</h1><p>' . __( 'Your <code>wp-config.php</code> file has an empty database table prefix, which is not supported.' ) . '</p></body></html>' );`
`168`	`168`	`}`
`169`	`169`
Original file line number	Diff line number	Diff line change
`@@ -1643,7 +1643,7 @@ function get_magic_quotes() {`
`1643`	`1643`	`if (version_compare(PHP_VERSION, '5.3.0', '<')) {`
`1644`	`1644`	`set_magic_quotes_runtime(0);`
`1645`	`1645`	`} else {`
`1646`		`- ini_set('magic_quotes_runtime', 0);`
	`1646`	`+ ini_set('magic_quotes_runtime', 0);`
`1647`	`1647`	`}`
`1648`	`1648`	`}`
`1649`	`1649`	`$file_buffer = file_get_contents($path);`
`@@ -1652,7 +1652,7 @@ function get_magic_quotes() {`
`1652`	`1652`	`if (version_compare(PHP_VERSION, '5.3.0', '<')) {`
`1653`	`1653`	`set_magic_quotes_runtime($magic_quotes);`
`1654`	`1654`	`} else {`
`1655`		`- ini_set('magic_quotes_runtime', $magic_quotes);`
	`1655`	`+ ini_set('magic_quotes_runtime', $magic_quotes);`
`1656`	`1656`	`}`
`1657`	`1657`	`}`
`1658`	`1658`	`return $file_buffer;`
Original file line number	Diff line number	Diff line change
`@@ -2775,7 +2775,7 @@ function get_language()`
`2775`	`2775`
`2776`	`2776`	`function get_latitude()`
`2777`	`2777`	`{`
`2778`		`-`
	`2778`	`+`
`2779`	`2779`	`if ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_W3C_BASIC_GEO, 'lat'))`
`2780`	`2780`	`{`
`2781`	`2781`	`return (float) $return[0]['data'];`
Original file line number	Diff line number	Diff line change
`@@ -372,7 +372,7 @@ public function offsetExists( $offset ) {`
`372`	`372`	`* Method to implement ArrayAccess for keys formerly returned by get_themes().`
`373`	`373`	`*`
`374`	`374`	`* Author, Author Name, Author URI, and Description did not previously return`
`375`		`- * translated data. We are doing so now as it is safe to do. However, as`
	`375`	`+ * translated data. We are doing so now as it is safe to do. However, as`
`376`	`376`	`* Name and Title could have been used as the key for get_themes(), both remain`
`377`	`377`	`* untranslated for back compatibility. This means that ['Name'] is not ideal,`
`378`	`378`	`* and care should be taken to use $theme->display('Name') to get a properly`