summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJennifer Hodgdon2012-11-13 16:48:25 (GMT)
committer Jennifer Hodgdon2012-11-13 16:48:25 (GMT)
commitc7d5a9a135f4c0ea562ce17c88a5c034351172b7 (patch)
treef347552f9f971bc3be03f483ec46cc09acf2efce
parent75a7e45adebba5741a909add556c38966bae0ba9 (diff)
Issue #1742958 by DamienMcKenna: Fix upper-casing of URL, HTTP, and similar words in comments
-rw-r--r--includes/bootstrap.inc4
-rw-r--r--includes/common.inc6
-rw-r--r--includes/database.mysql.inc4
-rw-r--r--includes/database.mysqli.inc4
-rw-r--r--includes/database.pgsql.inc2
-rw-r--r--includes/file.inc4
-rw-r--r--includes/form.inc2
-rw-r--r--includes/install.mysql.inc2
-rw-r--r--includes/install.mysqli.inc2
-rw-r--r--includes/install.pgsql.inc2
-rw-r--r--includes/theme.inc6
-rw-r--r--modules/filter/filter.module2
-rw-r--r--modules/forum/forum.module2
-rw-r--r--modules/node/node.tpl.php2
-rw-r--r--modules/profile/profile-wrapper.tpl.php2
-rw-r--r--modules/system/system.module4
-rwxr-xr-xscripts/drupal.sh2
17 files changed, 26 insertions, 26 deletions
diff --git a/includes/bootstrap.inc b/includes/bootstrap.inc
index bc6af1f..3c53a96 100644
--- a/includes/bootstrap.inc
+++ b/includes/bootstrap.inc
@@ -403,7 +403,7 @@ function conf_init() {
include_once './'. conf_path() .'/settings.php';
}
- // Ignore the placeholder url from default.settings.php.
+ // Ignore the placeholder URL from default.settings.php.
if (isset($db_url) && $db_url == 'mysql://username:password@localhost/databasename') {
$db_url = '';
}
@@ -442,7 +442,7 @@ function conf_init() {
}
else {
// Otherwise use $base_url as session name, without the protocol
- // to use the same session identifiers across http and https.
+ // to use the same session identifiers across HTTP and HTTPS.
list( , $session_name) = explode('://', $base_url, 2);
// We escape the hostname because it can be modified by a visitor.
if (!empty($_SERVER['HTTP_HOST'])) {
diff --git a/includes/common.inc b/includes/common.inc
index 604726e..cd694fd 100644
--- a/includes/common.inc
+++ b/includes/common.inc
@@ -176,7 +176,7 @@ function drupal_final_markup($content) {
* Add a feed URL for the current page.
*
* @param $url
- * A url for the feed.
+ * A URL for the feed.
* @param $title
* The title of the feed.
*/
@@ -533,7 +533,7 @@ function drupal_http_request($url, $headers = array(), $method = 'GET', $data =
$defaults['Content-Length'] = 'Content-Length: '. $content_length;
}
- // If the server url has a user then attempt to use basic authentication
+ // If the server URL has a user then attempt to use basic authentication
if (isset($uri['user'])) {
$defaults['Authorization'] = 'Authorization: Basic '. base64_encode($uri['user'] . (!empty($uri['pass']) ? ":". $uri['pass'] : ''));
}
@@ -3829,7 +3829,7 @@ function drupal_flush_all_caches() {
* Changes the character added to all css/js files as dummy query-string,
* so that all browsers are forced to reload fresh files. We keep
* 20 characters history (FIFO) to avoid repeats, but only the first
- * (newest) character is actually used on urls, to keep them short.
+ * (newest) character is actually used on URLs, to keep them short.
* This is also called from update.php.
*/
function _drupal_flush_css_js() {
diff --git a/includes/database.mysql.inc b/includes/database.mysql.inc
index 37e4ae5..5ad5f3e 100644
--- a/includes/database.mysql.inc
+++ b/includes/database.mysql.inc
@@ -55,9 +55,9 @@ function db_connect($url) {
_db_error_page('Unable to use the MySQL database because the MySQL extension for PHP is not installed. Check your <code>php.ini</code> to see how you can enable it.');
}
- // Decode url-encoded information in the db connection string
+ // Decode urlencoded information in the db connection string
$url['user'] = urldecode($url['user']);
- // Test if database url has a password.
+ // Test if database URL has a password.
$url['pass'] = isset($url['pass']) ? urldecode($url['pass']) : '';
$url['host'] = urldecode($url['host']);
$url['path'] = urldecode($url['path']);
diff --git a/includes/database.mysqli.inc b/includes/database.mysqli.inc
index c984c10..c6297b7 100644
--- a/includes/database.mysqli.inc
+++ b/includes/database.mysqli.inc
@@ -61,9 +61,9 @@ function db_connect($url) {
$url = parse_url($url);
- // Decode url-encoded information in the db connection string
+ // Decode urlencoded information in the db connection string
$url['user'] = urldecode($url['user']);
- // Test if database url has a password.
+ // Test if database URL has a password.
$url['pass'] = isset($url['pass']) ? urldecode($url['pass']) : '';
$url['host'] = urldecode($url['host']);
$url['path'] = urldecode($url['path']);
diff --git a/includes/database.pgsql.inc b/includes/database.pgsql.inc
index 00ba095..01f2c6b 100644
--- a/includes/database.pgsql.inc
+++ b/includes/database.pgsql.inc
@@ -52,7 +52,7 @@ function db_connect($url) {
$url = parse_url($url);
$conn_string = '';
- // Decode url-encoded information in the db connection string
+ // Decode urlencoded information in the db connection string
if (isset($url['user'])) {
$conn_string .= ' user='. urldecode($url['user']);
}
diff --git a/includes/file.inc b/includes/file.inc
index bbcf9dc..a07c302 100644
--- a/includes/file.inc
+++ b/includes/file.inc
@@ -38,7 +38,7 @@ define('FILE_STATUS_PERMANENT', 1);
* @return A string containing a URL that can be used to download the file.
*/
function file_create_url($path) {
- // Strip file_directory_path from $path. We only include relative paths in urls.
+ // Strip file_directory_path from $path. We only include relative paths in URLs.
if (strpos($path, file_directory_path() .'/') === 0) {
$path = trim(substr($path, strlen(file_directory_path())), '\\/');
}
@@ -862,7 +862,7 @@ function file_transfer($source, $headers) {
}
// IE cannot download private files because it cannot store files downloaded
- // over https in the browser cache. The problem can be solved by sending
+ // over HTTPS in the browser cache. The problem can be solved by sending
// custom headers to IE. See http://support.microsoft.com/kb/323308/en-us
if (isset($_SERVER['HTTPS']) && ($_SERVER['HTTPS'] == 'on')) {
drupal_set_header('Cache-Control: private');
diff --git a/includes/form.inc b/includes/form.inc
index 468fd95..514641d 100644
--- a/includes/form.inc
+++ b/includes/form.inc
@@ -1842,7 +1842,7 @@ function form_expand_ahah($element) {
if (is_string($ahah_binding['progress'])) {
$ahah_binding['progress'] = array('type' => $ahah_binding['progress']);
}
- // Change progress path to a full url.
+ // Change progress path to a full URL.
if (isset($ahah_binding['progress']['path'])) {
$ahah_binding['progress']['url'] = url($ahah_binding['progress']['path']);
}
diff --git a/includes/install.mysql.inc b/includes/install.mysql.inc
index e544294..73aa365 100644
--- a/includes/install.mysql.inc
+++ b/includes/install.mysql.inc
@@ -26,7 +26,7 @@ function drupal_test_mysql($url, &$success) {
$url = parse_url($url);
- // Decode url-encoded information in the db connection string.
+ // Decode urlencoded information in the db connection string.
$url['user'] = urldecode($url['user']);
$url['pass'] = isset($url['pass']) ? urldecode($url['pass']) : '';
$url['host'] = urldecode($url['host']);
diff --git a/includes/install.mysqli.inc b/includes/install.mysqli.inc
index 8920d01..0080804 100644
--- a/includes/install.mysqli.inc
+++ b/includes/install.mysqli.inc
@@ -26,7 +26,7 @@ function drupal_test_mysqli($url, &$success) {
$url = parse_url($url);
- // Decode url-encoded information in the db connection string.
+ // Decode urlencoded information in the db connection string.
$url['user'] = urldecode($url['user']);
$url['pass'] = isset($url['pass']) ? urldecode($url['pass']) : '';
$url['host'] = urldecode($url['host']);
diff --git a/includes/install.pgsql.inc b/includes/install.pgsql.inc
index fde97a3..5c2c21d 100644
--- a/includes/install.pgsql.inc
+++ b/includes/install.pgsql.inc
@@ -27,7 +27,7 @@ function drupal_test_pgsql($url, &$success) {
$url = parse_url($url);
$conn_string = '';
- // Decode url-encoded information in the db connection string
+ // Decode urlencoded information in the db connection string
if (isset($url['user'])) {
$conn_string .= ' user='. urldecode($url['user']);
}
diff --git a/includes/theme.inc b/includes/theme.inc
index e1e45e0..fbb4634 100644
--- a/includes/theme.inc
+++ b/includes/theme.inc
@@ -1592,7 +1592,7 @@ function theme_more_help_link($url) {
*
* @see theme_feed_icon()
* @param $url
- * The url of the feed.
+ * The URL of the feed.
*/
function theme_xml_icon($url) {
if ($image = theme('image', 'misc/xml.png', t('XML feed'), t('XML feed'))) {
@@ -1604,7 +1604,7 @@ function theme_xml_icon($url) {
* Return code that emits an feed icon.
*
* @param $url
- * The url of the feed.
+ * The URL of the feed.
* @param $title
* A descriptive title of the feed.
*/
@@ -1618,7 +1618,7 @@ function theme_feed_icon($url, $title) {
* Returns code that emits the 'more' link used on blocks.
*
* @param $url
- * The url of the main page
+ * The URL of the main page
* @param $title
* A descriptive verb for the link, like 'Read more'
*/
diff --git a/modules/filter/filter.module b/modules/filter/filter.module
index 49702fe..6ea0537 100644
--- a/modules/filter/filter.module
+++ b/modules/filter/filter.module
@@ -746,7 +746,7 @@ function _filter_url_settings($format) {
/**
* URL filter. Automatically converts text web addresses (URLs, e-mail addresses,
- * ftp links, etc.) into hyperlinks.
+ * FTP links, etc.) into hyperlinks.
*/
function _filter_url($text, $format) {
// Pass length to regexp callback
diff --git a/modules/forum/forum.module b/modules/forum/forum.module
index 1b027f3..d656f10 100644
--- a/modules/forum/forum.module
+++ b/modules/forum/forum.module
@@ -690,7 +690,7 @@ function template_preprocess_forums(&$variables) {
// Check if the current user has the 'create' permission for this node type.
if (node_access('create', $type)) {
// Fetch the "General" name of the content type;
- // Push the link with title and url to the array.
+ // Push the link with title and URL to the array.
$forum_types[$type] = array('title' => t('Post new @node_type', array('@node_type' => node_get_types('name', $type))), 'href' => 'node/add/'. str_replace('_', '-', $type) .'/'. $variables['tid']);
}
}
diff --git a/modules/node/node.tpl.php b/modules/node/node.tpl.php
index 0ae6fd9..0db067c 100644
--- a/modules/node/node.tpl.php
+++ b/modules/node/node.tpl.php
@@ -15,7 +15,7 @@
* - $links: Themed links like "Read more", "Add new comment", etc. output
* from theme_links().
* - $name: Themed username of node author output from theme_username().
- * - $node_url: Direct url of the current node.
+ * - $node_url: Direct URL of the current node.
* - $terms: the themed list of taxonomy term links output from theme_links().
* - $submitted: themed submission information output from
* theme_node_submitted().
diff --git a/modules/profile/profile-wrapper.tpl.php b/modules/profile/profile-wrapper.tpl.php
index 5b10d47..4601b59 100644
--- a/modules/profile/profile-wrapper.tpl.php
+++ b/modules/profile/profile-wrapper.tpl.php
@@ -6,7 +6,7 @@
* profiles.
*
* This template is used when viewing a list of users. It can be a general
- * list for viewing all users with the url of "example.com/profile" or when
+ * list for viewing all users with the URL of "example.com/profile" or when
* viewing a set of users who share a specific value for a profile such
* as "example.com/profile/country/belgium".
*
diff --git a/modules/system/system.module b/modules/system/system.module
index 09d13d1..6c7ac0e 100644
--- a/modules/system/system.module
+++ b/modules/system/system.module
@@ -1957,8 +1957,8 @@ function _system_zonelist() {
function system_check_http_request() {
// Try to get the content of the front page via drupal_http_request().
$result = drupal_http_request(url('', array('absolute' => TRUE)), array(), 'GET', NULL, 0);
- // We only care that we get a http response - this means that Drupal
- // can make a http request.
+ // We only care that we get a HTTP response - this means that Drupal
+ // can make a HTTP request.
$works = isset($result->code) && ($result->code >= 100) && ($result->code < 600);
variable_set('drupal_http_request_fails', !$works);
return $works;
diff --git a/scripts/drupal.sh b/scripts/drupal.sh
index 2bf035a..36b1f06 100755
--- a/scripts/drupal.sh
+++ b/scripts/drupal.sh
@@ -112,7 +112,7 @@ while ($param = array_shift($_SERVER['argv'])) {
$_REQUEST = $_GET;
}
- // set file to execute or Drupal path (clean urls enabled)
+ // set file to execute or Drupal path (clean URLs enabled)
if (isset($path['path']) && file_exists(substr($path['path'], 1))) {
$_SERVER['PHP_SELF'] = $_SERVER['REQUEST_URI'] = $path['path'];
$cmd = substr($path['path'], 1);