Changeset 4133

Timestamp:

08/30/06 16:40:17 (2 years ago)

Author:

ryan

Message:

s/URI/URL/. Props Nazgul. fixes #2666

Files:

• trunk/wp-admin/edit-comments.php (modified) (1 diff)
• trunk/wp-admin/edit-form-comment.php (modified) (1 diff)
• trunk/wp-admin/edit-form.php (modified) (1 diff)
• trunk/wp-admin/link-manager.php (modified) (1 diff)
• trunk/wp-admin/options-discussion.php (modified) (1 diff)
• trunk/wp-admin/options-general.php (modified) (1 diff)
• trunk/wp-admin/options-permalink.php (modified) (2 diffs)
• trunk/wp-admin/options-writing.php (modified) (1 diff)
• trunk/wp-content/themes/classic/comments-popup.php (modified) (2 diffs)
• trunk/wp-content/themes/classic/comments.php (modified) (1 diff)
• trunk/wp-content/themes/default/comments-popup.php (modified) (2 diffs)
• trunk/wp-includes/comment.php (modified) (1 diff)
• trunk/wp-includes/link-template.php (modified) (1 diff)
• trunk/wp-includes/pluggable.php (modified) (4 diffs)
• trunk/wp-includes/post.php (modified) (4 diffs)
• trunk/wp-includes/query.php (modified) (2 diffs)
• trunk/wp-includes/rewrite.php (modified) (1 diff)
• trunk/wp-trackback.php (modified) (1 diff)
• trunk/xmlrpc.php (modified) (7 diffs)

trunk/wp-admin/edit-comments.php

@@ -46 +46 @@
-  <input type="submit" name="submit" value="<?php _e('Search') ?>"  />  
-  <input type="hidden" name="mode" value="<?php echo $mode; ?>" />
-I
+L
-  </fieldset> 
-</form>

trunk/wp-admin/edit-form-comment.php

@@ -31 +31 @@
-</fieldset>
-<fieldset id="uridiv">
-I
+L
-        <div>
-          <input type="text" id="newcomment_author_url" name="newcomment_author_url" size="35" value="<?php echo $comment->comment_author_url ?>" tabindex="3" id="URL" />

trunk/wp-admin/edit-form.php

@@ -52 +52 @@
-<input type="hidden" name="post_pingback" value="<?php echo get_option('default_pingback_flag') ?>" id="post_pingback" />
-
-Identifier">URI</abbr></a>:</label> (Separate multiple <abbr title="Universal Resource Identifier">URI
+Locator">URL</abbr></a>:</label> (Separate multiple <abbr title="Universal Resource Locator">URL
-    <input type="text" name="trackback_url" style="width: 360px" id="trackback" tabindex="7" /></p>
-

trunk/wp-admin/link-manager.php

@@ -106 +106 @@
-    <tr>
-        <th width="15%" style="text-align: left"><?php _e('Name') ?></th>
-I
+L
-        <th style="text-align: left"><?php _e('Categories') ?></th>
-        <th><?php _e('rel') ?></th>

trunk/wp-admin/options-discussion.php

@@ -74 +74 @@
-<p><?php printf(__('Hold a comment in the queue if it contains more than %s links. (A common characteristic of comment spam is a large number of hyperlinks.)'), '<input name="comment_max_links" type="text" id="comment_max_links" size="3" value="' . get_settings('comment_max_links'). '" />' ) ?></p>
-
-I
+L
-<p> 
-<textarea name="moderation_keys" cols="60" rows="4" id="moderation_keys" style="width: 98%; font-size: 12px;" class="code"><?php form_option('moderation_keys'); ?></textarea> 

trunk/wp-admin/options-general.php

@@ -24 +24 @@
-</tr> 
-<tr valign="top"> 
-I
+L
-<td><input name="siteurl" type="text" id="siteurl" value="<?php form_option('siteurl'); ?>" size="40" class="code" /></td> 
-</tr> 
-<tr valign="top">
-I
+L
-<td><input name="home" type="text" id="home" value="<?php form_option('home'); ?>" size="40" class="code" /><br /><?php _e('If you want your blog homepage <a href="http://codex.wordpress.org/Giving_WordPress_Its_Own_Directory">to be different than the directory</a> you installed WordPress in, enter that address here.'); ?></td>
-</tr>

trunk/wp-admin/options-permalink.php

@@ -103 +103 @@
-<div class="wrap"> 
-  <h2><?php _e('Customize Permalink Structure') ?></h2> 
-URIs which have question marks and lots of numbers in them, however WordPress offers you the ability to create a custom URI
+<abbr title="Universal Resource Locator">URL</abbr>s which have question marks and lots of numbers in them, however WordPress offers you the ability to create a custom URL
-
-<?php
@@ -153 +153 @@
-<h3><?php _e('Optional'); ?></h3>
-<?php if ($is_apache) : ?>
-URI
+<abbr title="Universal Resource Locator">URL</abbr>
-<?php else : ?>
-URI
+<abbr title="Universal Resource Locator">URL</abbr>
-<?php endif; ?>
-    <p> 

trunk/wp-admin/options-writing.php

@@ -97 +97 @@
-<fieldset class="options">
-<legend><?php _e('Update Services') ?></legend>
-URI
+<abbr title="Universal Resource Locator">URL</abbr>
-
-<textarea name="ping_sites" id="ping_sites" style="width: 98%;" rows="3" cols="50"><?php form_option('ping_sites'); ?></textarea>

trunk/wp-content/themes/classic/comments-popup.php

@@ -25 +25 @@
-
-<?php if ('open' == $post->ping_status) { ?>
-cronym title=\"Uniform Resource Identifier\">URI</acronym
+bbr title=\"Universal Resource Locator\">URL</abbr
-<?php } ?>
-
@@ -71 +71 @@
-    <p>
-      <input type="text" name="url" id="url" value="<?php echo $comment_author_url; ?>" size="28" tabindex="3" />
-cronym title=\"Uniform Resource Identifier\">URI</acronym
+bbr title=\"Universal Resource Locator\">URL</abbr
-    </p>
-

trunk/wp-content/themes/classic/comments.php

@@ -28 +28 @@
-<p><?php comments_rss_link(__('<abbr title="Really Simple Syndication">RSS</abbr> feed for comments on this post.')); ?> 
-<?php if ( pings_open() ) : ?>
-form Resource Identifier">URI
+versal Resource Locator">URL
-<?php endif; ?>
-</p>

trunk/wp-content/themes/default/comments-popup.php

@@ -25 +25 @@
-
-<?php if ('open' == $post->ping_status) { ?>
-cronym title="Uniform Resource Identifier">URI</acronym
+bbr title="Universal Resource Locator">URL</abbr
-<?php } ?>
-
@@ -71 +71 @@
-    <p>
-      <input type="text" name="url" id="url" value="<?php echo $comment_author_url; ?>" size="28" tabindex="3" />
-cronym title="Uniform Resource Identifier">URI</acronym
+bbr title="Universal Resource Locator">URL</abbr
-    </p>
-

trunk/wp-includes/comment.php

@@ -554 +554 @@
-            $pingback_server_url_len = $pingback_href_end - $pingback_href_start;
-            $pingback_server_url = substr($contents, $pingback_href_start, $pingback_server_url_len);
-I
+L
-            if ($pingback_server_url_len > 0) {
-                // We got it!

trunk/wp-includes/link-template.php

@@ -399 +399 @@
-            } else {
-                // If using path info style permalinks, make sure the index is in
-I
+L
-                if ( strpos($qstr, $index) === false )
-                    $qstr = '/' . $index . $qstr;

trunk/wp-includes/pluggable.php

@@ -346 +346 @@
-        $notify_message .= sprintf( __('Author : %1$s (IP: %2$s , %3$s)'), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n";
-        $notify_message .= sprintf( __('E-mail : %s'), $comment->comment_author_email ) . "\r\n";
-I
+L
-        $notify_message .= sprintf( __('Whois  : http://ws.arin.net/cgi-bin/whois.pl?queryinput=%s'), $comment->comment_author_IP ) . "\r\n";
-        $notify_message .= __('Comment: ') . "\r\n" . $comment->comment_content . "\r\n\r\n";
@@ -354 +354 @@
-        $notify_message  = sprintf( __('New trackback on your post #%1$s "%2$s"'), $comment->comment_post_ID, $post->post_title ) . "\r\n";
-        $notify_message .= sprintf( __('Website: %1$s (IP: %2$s , %3$s)'), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n";
-I
+L
-        $notify_message .= __('Excerpt: ') . "\r\n" . $comment->comment_content . "\r\n\r\n";
-        $notify_message .= __('You can see all trackbacks on this post here: ') . "\r\n";
@@ -361 +361 @@
-        $notify_message  = sprintf( __('New pingback on your post #%1$s "%2$s"'), $comment->comment_post_ID, $post->post_title ) . "\r\n";
-        $notify_message .= sprintf( __('Website: %1$s (IP: %2$s , %3$s)'), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n";
-I
+L
-        $notify_message .= __('Excerpt: ') . "\r\n" . sprintf('[...] %s [...]', $comment->comment_content ) . "\r\n\r\n";
-        $notify_message .= __('You can see all pingbacks on this post here: ') . "\r\n";
@@ -421 +421 @@
-    $notify_message .= sprintf( __('Author : %1$s (IP: %2$s , %3$s)'), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n";
-    $notify_message .= sprintf( __('E-mail : %s'), $comment->comment_author_email ) . "\r\n";
-I
+L
-    $notify_message .= sprintf( __('Whois  : http://ws.arin.net/cgi-bin/whois.pl?queryinput=%s'), $comment->comment_author_IP ) . "\r\n";
-    $notify_message .= __('Comment: ') . "\r\n" . $comment->comment_content . "\r\n\r\n";

trunk/wp-includes/post.php

@@ -815 +815 @@
-//
-
-I
+L
-    global $wpdb;
-    $pung = $wpdb->get_var("SELECT pinged FROM $wpdb->posts WHERE ID = $post_id");
@@ -845 +845 @@
-}
-
-I
+L
-    global $wpdb;
-    $pung = $wpdb->get_var("SELECT pinged FROM $wpdb->posts WHERE ID = $post_id");
@@ -854 +854 @@
-}
-
-I
+L
-    global $wpdb;
-    $to_ping = $wpdb->get_var("SELECT to_ping FROM $wpdb->posts WHERE ID = $post_id");
@@ -1110 +1110 @@
-        foreach ($posts as $id => $post) {
-
-I
+L
-            $uri = get_page_uri($id);
-            $attachments = $wpdb->get_results("SELECT ID, post_name, post_parent FROM $wpdb->posts WHERE post_type = 'attachment' AND post_parent = '$id'");

trunk/wp-includes/query.php

@@ -765 +765 @@
-        }
-
-I
+L
-
-        global $cache_categories;
@@ -824 +824 @@
-        }
-
-I
+L
-
-        if ('' != $q['author_name']) {

trunk/wp-includes/rewrite.php

@@ -85 +85 @@
-    $url = $url_split[0];
-
-I
+L
-    $url_split = explode('?', $url);
-    $url = $url_split[0];

trunk/wp-trackback.php

@@ -87 +87 @@
-    $dupe = $wpdb->get_results("SELECT * FROM $wpdb->comments WHERE comment_post_ID = '$comment_post_ID' AND comment_author_url = '$comment_author_url'");
-    if ( $dupe )
-I
+L
-
-    $commentdata = compact('comment_post_ID', 'comment_author', 'comment_author_email', 'comment_author_url', 'comment_content', 'comment_type');

trunk/xmlrpc.php

@@ -329 +329 @@
-      }
-
-I
+L
-      $filename = get_settings('home') . '/';
-      $filename = preg_replace('#https?://.+?/#', $_SERVER['DOCUMENT_ROOT'].'/', $filename);
@@ -364 +364 @@
-      }
-
-I
+L
-      $filename = get_settings('home') . '/';
-      $filename = preg_replace('#https?://.+?/#', $_SERVER['DOCUMENT_ROOT'].'/', $filename);
@@ -1154 +1154 @@
-        } else {
-            // TODO: Attempt to extract a post ID from the given URL
-I
+L
-        }
-        $post_ID = (int) $post_ID;
-
-
-I
+L
-
-        $post = get_post($post_ID);
-
-        if ( !$post ) // Post_ID not found
-I
+L
-
-        if ( $post_ID == url_to_postid($pagelinkedfrom) )
-I and the target URI
+L and the target URL
-
-        // Check if pings are on
-        if ( 'closed' == $post->ping_status )
-I
+L
-
-        // Let's check that the remote site didn't already pingback this entry
@@ -1185 +1185 @@
-        $linea = wp_remote_fopen( $pagelinkedfrom );
-        if ( !$linea )
-I
+L
-
-        // Work around bug in strip_tags():
@@ -1220 +1220 @@
-
-        if ( empty($context) ) // URL pattern not found
-I does not contain a link to the target URI
+L does not contain a link to the target URL
-
-        $pagelinkedfrom = preg_replace('#&([^amp\;])#is', '&$1', $pagelinkedfrom);
@@ -1260 +1260 @@
-        if (!$post_ID) {
-            // We aren't sure that the resource is available and/or pingback enabled
-I
+L
-        }
-
@@ -1267 +1267 @@
-        if (!$actual_post) {
-            // No such post = resource not found
-I
+L
-        }
-