summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--includes/authorize.inc2
-rw-r--r--includes/bootstrap.inc4
-rw-r--r--includes/common.inc10
-rw-r--r--includes/file.inc6
-rw-r--r--includes/stream_wrappers.inc6
-rw-r--r--includes/theme.inc4
-rw-r--r--includes/update.inc2
-rw-r--r--misc/collapse.js2
-rw-r--r--modules/aggregator/aggregator.test4
-rw-r--r--modules/comment/comment.module2
-rw-r--r--modules/dblog/dblog.test2
-rw-r--r--modules/image/image.module2
-rw-r--r--modules/locale/locale.module2
-rw-r--r--modules/locale/locale.test12
-rw-r--r--modules/node/node.module2
-rw-r--r--modules/node/node.tpl.php2
-rw-r--r--modules/openid/openid.inc2
-rw-r--r--modules/overlay/overlay-parent.js6
-rw-r--r--modules/profile/profile-wrapper.tpl.php2
-rw-r--r--modules/rdf/rdf.test2
-rw-r--r--modules/simpletest/drupal_web_test_case.php8
-rw-r--r--modules/simpletest/simpletest.api.php2
-rw-r--r--modules/simpletest/tests/common.test22
-rw-r--r--modules/simpletest/tests/https.php4
-rw-r--r--modules/simpletest/tests/mail.test4
-rw-r--r--modules/simpletest/tests/menu.test2
-rw-r--r--modules/simpletest/tests/session.test8
-rw-r--r--modules/system/system.api.php6
-rw-r--r--modules/system/system.install2
-rw-r--r--modules/system/system.module4
-rw-r--r--modules/taxonomy/taxonomy-term.tpl.php2
-rw-r--r--modules/taxonomy/taxonomy.module2
-rw-r--r--modules/update/update.test2
-rw-r--r--modules/user/user.module2
-rwxr-xr-xscripts/drupal.sh2
-rwxr-xr-xscripts/run-tests.sh4
-rw-r--r--themes/bartik/templates/node.tpl.php2
37 files changed, 77 insertions, 77 deletions
diff --git a/includes/authorize.inc b/includes/authorize.inc
index da6918c..8360e13 100644
--- a/includes/authorize.inc
+++ b/includes/authorize.inc
@@ -18,7 +18,7 @@ function authorize_filetransfer_form($form, &$form_state) {
global $base_url, $is_https;
$form = array();
- // If possible, we want to post this form securely via https.
+ // If possible, we want to post this form securely via HTTPS.
$form['#https'] = TRUE;
// CSS we depend on lives in modules/system/maintenance.css, which is loaded
diff --git a/includes/bootstrap.inc b/includes/bootstrap.inc
index d1d78b5..709789b 100644
--- a/includes/bootstrap.inc
+++ b/includes/bootstrap.inc
@@ -725,7 +725,7 @@ function drupal_settings_initialize() {
$base_root = substr($base_url, 0, strlen($base_url) - strlen($parts['path']));
}
else {
- // Create base URL
+ // Create base URL.
$http_protocol = $is_https ? 'https' : 'http';
$base_root = $http_protocol . '://' . $_SERVER['HTTP_HOST'];
@@ -751,7 +751,7 @@ function drupal_settings_initialize() {
}
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);
// HTTP_HOST can be modified by a visitor, but we already sanitized it
// in drupal_settings_initialize().
diff --git a/includes/common.inc b/includes/common.inc
index 24d7405..91a40cb 100644
--- a/includes/common.inc
+++ b/includes/common.inc
@@ -448,7 +448,7 @@ function drupal_get_query_parameters(array $query = NULL, array $exclude = array
* The query string to split.
*
* @return
- * An array of url decoded couples $param_name => $value.
+ * An array of URL decoded couples $param_name => $value.
*/
function drupal_get_query_array($query) {
$result = array();
@@ -2140,7 +2140,7 @@ function format_username($account) {
* for the URL. If $options['language'] is omitted, the global $language_url
* will be used.
* - 'https': Whether this URL should point to a secure location. If not
- * defined, the current scheme is used, so the user stays on http or https
+ * defined, the current scheme is used, so the user stays on HTTP or HTTPS
* respectively. TRUE enforces HTTPS and FALSE enforces HTTP, but HTTPS can
* only be enforced when the variable 'https' is set to TRUE.
* - 'base_url': Only used internally, to modify the base URL when a language
@@ -7795,16 +7795,16 @@ function entity_prepare_view($entity_type, $entities, $langcode = NULL) {
}
/**
- * Returns the uri elements of an entity.
+ * Returns the URI elements of an entity.
*
* @param $entity_type
* The entity type; e.g. 'node' or 'user'.
* @param $entity
* The entity for which to generate a path.
* @return
- * An array containing the 'path' and 'options' keys used to build the uri of
+ * An array containing the 'path' and 'options' keys used to build the URI of
* the entity, and matching the signature of url(). NULL if the entity has no
- * uri of its own.
+ * URI of its own.
*/
function entity_uri($entity_type, $entity) {
$info = entity_get_info($entity_type);
diff --git a/includes/file.inc b/includes/file.inc
index 971a019..1e256c6 100644
--- a/includes/file.inc
+++ b/includes/file.inc
@@ -398,8 +398,8 @@ function file_create_url($uri) {
}
}
elseif ($scheme == 'http' || $scheme == 'https') {
- // Check for http so that we don't have to implement getExternalUrl() for
- // the http wrapper.
+ // Check for HTTP so that we don't have to implement getExternalUrl() for
+ // the HTTP wrapper.
return $uri;
}
else {
@@ -2236,7 +2236,7 @@ function drupal_realpath($uri) {
if ($wrapper = file_stream_wrapper_get_instance_by_uri($uri)) {
return $wrapper->realpath();
}
- // Check that the uri has a value. There is a bug in PHP 5.2 on *BSD systems
+ // Check that the URI has a value. There is a bug in PHP 5.2 on *BSD systems
// that makes realpath not return FALSE as expected when passing an empty
// variable.
// @todo Remove when Drupal drops support for PHP 5.2.
diff --git a/includes/stream_wrappers.inc b/includes/stream_wrappers.inc
index 2af8c9e..fa401c6 100644
--- a/includes/stream_wrappers.inc
+++ b/includes/stream_wrappers.inc
@@ -553,7 +553,7 @@ abstract class DrupalLocalStreamWrapper implements DrupalStreamWrapperInterface
* Support for unlink().
*
* @param $uri
- * A string containing the uri to the resource to delete.
+ * A string containing the URI to the resource to delete.
*
* @return
* TRUE if resource was successfully deleted.
@@ -569,9 +569,9 @@ abstract class DrupalLocalStreamWrapper implements DrupalStreamWrapperInterface
* Support for rename().
*
* @param $from_uri,
- * The uri to the file to rename.
+ * The URI to the file to rename.
* @param $to_uri
- * The new uri for file.
+ * The new URI for file.
*
* @return
* TRUE if file was successfully renamed.
diff --git a/includes/theme.inc b/includes/theme.inc
index 79750af..1f8dfcf 100644
--- a/includes/theme.inc
+++ b/includes/theme.inc
@@ -2112,7 +2112,7 @@ function theme_item_list($variables) {
*
* @param $variables
* An associative array containing:
- * - url: The url for the link.
+ * - url: The URL for the link.
*/
function theme_more_help_link($variables) {
return '<div class="more-help-link">' . l(t('More help'), $variables['url']) . '</div>';
@@ -2177,7 +2177,7 @@ function theme_html_tag($variables) {
*
* @param $variables
* An associative array containing:
- * - url: The url of the main page.
+ * - url: The URL of the main page.
* - title: A descriptive verb for the link, like 'Read more'.
*/
function theme_more_link($variables) {
diff --git a/includes/update.inc b/includes/update.inc
index f7c7b66..2d70ac0 100644
--- a/includes/update.inc
+++ b/includes/update.inc
@@ -895,7 +895,7 @@ function update_get_d6_session_name() {
}
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);
}
diff --git a/misc/collapse.js b/misc/collapse.js
index 1a98dc0..bd51ce5 100644
--- a/misc/collapse.js
+++ b/misc/collapse.js
@@ -58,7 +58,7 @@ Drupal.behaviors.collapse = {
$('fieldset.collapsible', context).once('collapse', function () {
var $fieldset = $(this);
// Expand fieldset if there are errors inside, or if it contains an
- // element that is targeted by the uri fragment identifier.
+ // element that is targeted by the URI fragment identifier.
var anchor = location.hash && location.hash != '#' ? ', ' + location.hash : '';
if ($('.error' + anchor, $fieldset).length) {
$fieldset.removeClass('collapsed');
diff --git a/modules/aggregator/aggregator.test b/modules/aggregator/aggregator.test
index 77b60cb..bd7dd5f 100644
--- a/modules/aggregator/aggregator.test
+++ b/modules/aggregator/aggregator.test
@@ -167,12 +167,12 @@ class AggregatorTestCase extends DrupalWebTestCase {
/**
- * Check if the feed name and url is unique.
+ * Check if the feed name and URL is unique.
*
* @param $feed_name
* String containing the feed name to check.
* @param $feed_url
- * String containing the feed url to check.
+ * String containing the feed URL to check.
* @return
* TRUE if feed is unique.
*/
diff --git a/modules/comment/comment.module b/modules/comment/comment.module
index 429c3b0..0f2c15a 100644
--- a/modules/comment/comment.module
+++ b/modules/comment/comment.module
@@ -152,7 +152,7 @@ function comment_node_type_load($name) {
}
/**
- * Entity uri callback.
+ * Entity URI callback.
*/
function comment_uri($comment) {
return array(
diff --git a/modules/dblog/dblog.test b/modules/dblog/dblog.test
index a91356c8..ad01e97 100644
--- a/modules/dblog/dblog.test
+++ b/modules/dblog/dblog.test
@@ -256,7 +256,7 @@ class DBLogTestCase extends DrupalWebTestCase {
// View dblog page-not-found report page.
$this->drupalGet('admin/reports/page-not-found');
$this->assertResponse(200);
- // Check that full-length url displayed.
+ // Check that full-length URL displayed.
$this->assertText($not_found_url, t('DBLog event was recorded: [page not found]'));
}
diff --git a/modules/image/image.module b/modules/image/image.module
index 5946e61..ff50452 100644
--- a/modules/image/image.module
+++ b/modules/image/image.module
@@ -1262,7 +1262,7 @@ function theme_image_style($variables) {
$variables['width'] = $dimensions['width'];
$variables['height'] = $dimensions['height'];
- // Determine the url for the styled image.
+ // Determine the URL for the styled image.
$variables['path'] = image_style_url($variables['style_name'], $variables['path']);
return theme('image', $variables);
}
diff --git a/modules/locale/locale.module b/modules/locale/locale.module
index a20f3d5..94e7cd1 100644
--- a/modules/locale/locale.module
+++ b/modules/locale/locale.module
@@ -1033,7 +1033,7 @@ function locale_url_outbound_alter(&$path, &$options, $original_path) {
include_once DRUPAL_ROOT . '/includes/language.inc';
foreach (language_types_configurable() as $type) {
- // Get url rewriter callbacks only from enabled language providers.
+ // Get URL rewriter callbacks only from enabled language providers.
$negotiation = variable_get("language_negotiation_$type", array());
foreach ($negotiation as $id => $provider) {
diff --git a/modules/locale/locale.test b/modules/locale/locale.test
index 6f3135b..632506e 100644
--- a/modules/locale/locale.test
+++ b/modules/locale/locale.test
@@ -1958,7 +1958,7 @@ class LocalePathFunctionalTest extends DrupalWebTestCase {
public static function getInfo() {
return array(
'name' => 'Path language settings',
- 'description' => 'Checks you can configure a language for individual url aliases.',
+ 'description' => 'Checks you can configure a language for individual URL aliases.',
'group' => 'Locale',
);
}
@@ -2268,7 +2268,7 @@ class LocaleUILanguageNegotiationTest extends DrupalWebTestCase {
public static function getInfo() {
return array(
'name' => 'UI language negotiation',
- 'description' => 'Test UI language switching by url path prefix and domain.',
+ 'description' => 'Test UI language switching by URL path prefix and domain.',
'group' => 'Locale',
);
}
@@ -2396,7 +2396,7 @@ class LocaleUILanguageNegotiationTest extends DrupalWebTestCase {
$this->assertResponse(404, "Unknown language path prefix should return 404");
// Setup for domain negotiation, first configure the language to have domain
- // URL. We use https and a port to make sure that only the domain name is used.
+ // URL. We use HTTPS and a port to make sure that only the domain name is used.
$edit = array('prefix' => '', 'domain' => "https://$language_domain:99");
$this->drupalPost("admin/config/regional/language/edit/$language", $edit, t('Save language'));
// Set the site to use domain language negotiation.
@@ -2513,7 +2513,7 @@ class LocaleUILanguageNegotiationTest extends DrupalWebTestCase {
$languages = language_list();
foreach (array('it', 'fr') as $langcode) {
- // Build the link we're going to test based on the clean url setting.
+ // Build the link we're going to test based on the clean URL setting.
$link = (!empty($GLOBALS['conf']['clean_url'])) ? $langcode . '.example.com/admin' : $langcode . '.example.com/?q=admin';
// Test URL in another language.
@@ -2524,14 +2524,14 @@ class LocaleUILanguageNegotiationTest extends DrupalWebTestCase {
$correct_link = $url_scheme . $link;
$this->assertTrue($url == $correct_link, t('The url() function returns the right url (@url) in accordance with the chosen language', array('@url' => $url . " == " . $correct_link)));
- // Test https via options.
+ // Test HTTPS via options.
variable_set('https', TRUE);
$url = url('admin', array('https' => TRUE, 'language' => $languages[$langcode]));
$correct_link = 'https://' . $link;
$this->assertTrue($url == $correct_link, t('The url() function returns the right https url (via options) (@url) in accordance with the chosen language', array('@url' => $url . " == " . $correct_link)));
variable_set('https', FALSE);
- // Test https via current url scheme.
+ // Test HTTPS via current URL scheme.
$temp_https = $is_https;
$is_https = TRUE;
$url = url('admin', array('language' => $languages[$langcode]));
diff --git a/modules/node/node.module b/modules/node/node.module
index f3375f3..65a4224 100644
--- a/modules/node/node.module
+++ b/modules/node/node.module
@@ -243,7 +243,7 @@ function node_field_display_node_alter(&$display, $context) {
}
/**
- * Entity uri callback.
+ * Entity URI callback.
*/
function node_uri($node) {
return array(
diff --git a/modules/node/node.tpl.php b/modules/node/node.tpl.php
index 1082b33..4c358a1 100644
--- a/modules/node/node.tpl.php
+++ b/modules/node/node.tpl.php
@@ -14,7 +14,7 @@
* - $date: Formatted creation date. Preprocess functions can reformat it by
* calling format_date() with the desired parameters on the $created variable.
* - $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.
* - $display_submitted: Whether submission information should be displayed.
* - $submitted: Submission information created from $name and $date during
* template_preprocess_node().
diff --git a/modules/openid/openid.inc b/modules/openid/openid.inc
index 9b793d3..bf9318a 100644
--- a/modules/openid/openid.inc
+++ b/modules/openid/openid.inc
@@ -835,7 +835,7 @@ function _openid_invalid_openid_transition($identity, $response) {
$fallback_account = user_external_load($fallback_identity);
}
- // Try to replace https with http. OpenID providers often redirect
+ // Try to replace HTTPS with HTTP. OpenID providers often redirect
// from http to https, but Drupal didn't follow the redirect.
if (!$fallback_account && strpos($fallback_identity, 'https://') !== FALSE) {
$fallback_identity = str_replace('https://', 'http://', $fallback_identity);
diff --git a/modules/overlay/overlay-parent.js b/modules/overlay/overlay-parent.js
index ace7def..76e1cf2 100644
--- a/modules/overlay/overlay-parent.js
+++ b/modules/overlay/overlay-parent.js
@@ -339,7 +339,7 @@ Drupal.overlay.setFocusBefore = function ($element, document) {
* Check if the given link is in the administrative section of the site.
*
* @param url
- * The url to be tested.
+ * The URL to be tested.
*
* @return boolean
* TRUE if the URL represents an administrative link, FALSE otherwise.
@@ -374,7 +374,7 @@ Drupal.overlay.isAdminLink = function (url) {
* Determine whether a link is external to the site.
*
* @param url
- * The url to be tested.
+ * The URL to be tested.
*
* @return boolean
* TRUE if the URL is external to the site, FALSE otherwise.
@@ -560,7 +560,7 @@ Drupal.overlay.eventhandlerOverrideLink = function (event) {
var target = $target[0];
var href = target.href;
- // Only handle links that have an href attribute and use the http(s) protocol.
+ // Only handle links that have an href attribute and use the HTTP(S) protocol.
if (href != undefined && href != '' && target.protocol.match(/^https?\:/)) {
var anchor = href.replace(target.ownerDocument.location.href, '');
// Skip anchor links.
diff --git a/modules/profile/profile-wrapper.tpl.php b/modules/profile/profile-wrapper.tpl.php
index 997ab98..3940ba0 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/rdf/rdf.test b/modules/rdf/rdf.test
index 9f786ab..b8aeb90 100644
--- a/modules/rdf/rdf.test
+++ b/modules/rdf/rdf.test
@@ -159,7 +159,7 @@ class RdfRdfaMarkupTestCase extends DrupalWebTestCase {
$image = current($this->drupalGetTestFiles('image'));
// Create an array for drupalPost with the field names as the keys and
- // the uris for the test files as the values.
+ // the URIs for the test files as the values.
$edit = array("files[" . $field_name . "_" . $langcode . "_0]" => drupal_realpath($file->uri),
"files[" . $image_field . "_" . $langcode . "_0]" => drupal_realpath($image->uri));
diff --git a/modules/simpletest/drupal_web_test_case.php b/modules/simpletest/drupal_web_test_case.php
index b7a5f1a..a67c771 100644
--- a/modules/simpletest/drupal_web_test_case.php
+++ b/modules/simpletest/drupal_web_test_case.php
@@ -1697,8 +1697,8 @@ class DrupalWebTestCase extends DrupalTestCase {
CURLOPT_URL => $base_url,
CURLOPT_FOLLOWLOCATION => FALSE,
CURLOPT_RETURNTRANSFER => TRUE,
- CURLOPT_SSL_VERIFYPEER => FALSE, // Required to make the tests run on https.
- CURLOPT_SSL_VERIFYHOST => FALSE, // Required to make the tests run on https.
+ CURLOPT_SSL_VERIFYPEER => FALSE, // Required to make the tests run on HTTPS.
+ CURLOPT_SSL_VERIFYHOST => FALSE, // Required to make the tests run on HTTPS.
CURLOPT_HEADERFUNCTION => array(&$this, 'curlHeaderCallback'),
CURLOPT_USERAGENT => $this->databasePrefix,
);
@@ -2698,10 +2698,10 @@ class DrupalWebTestCase extends DrupalTestCase {
}
/**
- * Get the current url from the cURL handler.
+ * Get the current URL from the cURL handler.
*
* @return
- * The current url.
+ * The current URL.
*/
protected function getUrl() {
return $this->url;
diff --git a/modules/simpletest/simpletest.api.php b/modules/simpletest/simpletest.api.php
index 04c080b..d262ad6 100644
--- a/modules/simpletest/simpletest.api.php
+++ b/modules/simpletest/simpletest.api.php
@@ -20,7 +20,7 @@
*/
function hook_simpletest_alter(&$groups) {
// An alternative session handler module would not want to run the original
- // Session https handling test because it checks the sessions table in the
+ // Session HTTPS handling test because it checks the sessions table in the
// database.
unset($groups['Session']['testHttpsSession']);
}
diff --git a/modules/simpletest/tests/common.test b/modules/simpletest/tests/common.test
index 8848b5c..e8e4033 100644
--- a/modules/simpletest/tests/common.test
+++ b/modules/simpletest/tests/common.test
@@ -1847,14 +1847,14 @@ class DrupalRenderTestCase extends DrupalWebTestCase {
class ValidUrlTestCase extends DrupalUnitTestCase {
public static function getInfo() {
return array(
- 'name' => 'Valid Url',
- 'description' => "Performs tests on Drupal's valid url function.",
+ 'name' => 'Valid URL',
+ 'description' => "Performs tests on Drupal's valid URL function.",
'group' => 'System'
);
}
/**
- * Test valid absolute urls.
+ * Test valid absolute URLs.
*/
function testValidAbsolute() {
$url_schemes = array('http', 'https', 'ftp');
@@ -1889,7 +1889,7 @@ class ValidUrlTestCase extends DrupalUnitTestCase {
}
/**
- * Test invalid absolute urls.
+ * Test invalid absolute URLs.
*/
function testInvalidAbsolute() {
$url_schemes = array('http', 'https', 'ftp');
@@ -1909,7 +1909,7 @@ class ValidUrlTestCase extends DrupalUnitTestCase {
}
/**
- * Test valid relative urls.
+ * Test valid relative URLs.
*/
function testValidRelative() {
$valid_relative_urls = array(
@@ -1930,7 +1930,7 @@ class ValidUrlTestCase extends DrupalUnitTestCase {
}
/**
- * Test invalid relative urls.
+ * Test invalid relative URLs.
*/
function testInvalidRelative() {
$invalid_relative_urls = array(
@@ -2540,12 +2540,12 @@ class DrupalAddFeedTestCase extends DrupalWebTestCase {
'output_url' => url($path, array('absolute' => TRUE)),
'title' => '',
),
- 'external url without title' => array(
+ 'external URL without title' => array(
'input_url' => $external_url,
'output_url' => $external_url,
'title' => '',
),
- 'local url without title' => array(
+ 'local URL without title' => array(
'input_url' => $fully_qualified_local_url,
'output_url' => $fully_qualified_local_url,
'title' => '',
@@ -2555,12 +2555,12 @@ class DrupalAddFeedTestCase extends DrupalWebTestCase {
'output_url' => url($path_for_title, array('absolute' => TRUE)),
'title' => $this->randomName(12),
),
- 'external url with title' => array(
+ 'external URL with title' => array(
'input_url' => $external_for_title,
'output_url' => $external_for_title,
'title' => $this->randomName(12),
),
- 'local url with title' => array(
+ 'local URL with title' => array(
'input_url' => $fully_qualified_for_title,
'output_url' => $fully_qualified_for_title,
'title' => $this->randomName(12),
@@ -2581,7 +2581,7 @@ class DrupalAddFeedTestCase extends DrupalWebTestCase {
* Create a pattern representing the RSS feed in the page.
*/
function urlToRSSLinkPattern($url, $title = '') {
- // Escape any regular expression characters in the url ('?' is the worst).
+ // Escape any regular expression characters in the URL ('?' is the worst).
$url = preg_replace('/([+?.*])/', '[$0]', $url);
$generated_pattern = '%<link +rel="alternate" +type="application/rss.xml" +title="' . $title . '" +href="' . $url . '" */>%';
return $generated_pattern;
diff --git a/modules/simpletest/tests/https.php b/modules/simpletest/tests/https.php
index b5ffab6..0e1a4ed 100644
--- a/modules/simpletest/tests/https.php
+++ b/modules/simpletest/tests/https.php
@@ -2,13 +2,13 @@
/**
* @file
- * Fake an https request, for use during testing.
+ * Fake an HTTPS request, for use during testing.
*/
// Set a global variable to indicate a mock HTTPS request.
$is_https_mock = empty($_SERVER['HTTPS']);
-// Change to https.
+// Change to HTTPS.
$_SERVER['HTTPS'] = 'on';
foreach ($_SERVER as $key => $value) {
$_SERVER[$key] = str_replace('modules/simpletest/tests/https.php', 'index.php', $value);
diff --git a/modules/simpletest/tests/mail.test b/modules/simpletest/tests/mail.test
index 09dcde6..b7ce685 100644
--- a/modules/simpletest/tests/mail.test
+++ b/modules/simpletest/tests/mail.test
@@ -150,7 +150,7 @@ class DrupalHtmlToTextTestCase extends DrupalWebTestCase {
$tests = array(
// @todo Trailing linefeeds should be trimmed.
'<a href = "http://drupal.org">Drupal.org</a>' => "Drupal.org [1]\n\n[1] http://drupal.org\n",
- // @todo Footer urls should be absolute.
+ // @todo Footer URLs should be absolute.
"<a href = \"$base_path\">Homepage</a>" => "Homepage [1]\n\n[1] $base_url/\n",
'<address>Drupal</address>' => "Drupal\n",
// @todo The <address> tag is currently not supported.
@@ -367,7 +367,7 @@ class DrupalHtmlToTextTestCase extends DrupalWebTestCase {
. '<br /><a href="http://www.example.com">Host, no path</a>'
. '<br /><a href="' . $base_path . 'node/1">Path, no host</a>'
. '<br /><a href="node/1">Relative path</a>';
- // @todo Footnote urls should be absolute.
+ // @todo Footnote URLs should be absolute.
$tt = "Host and path [1]"
. "\nHost, no path [2]"
// @todo The following two references should be combined.
diff --git a/modules/simpletest/tests/menu.test b/modules/simpletest/tests/menu.test
index b31fee6..1ecc1b1 100644
--- a/modules/simpletest/tests/menu.test
+++ b/modules/simpletest/tests/menu.test
@@ -599,7 +599,7 @@ class MenuRouterTestCase extends DrupalWebTestCase {
}
/**
- * Get a url and assert the title given a case number. If override is true,
+ * Get a URL and assert the title given a case number. If override is true,
* the title is asserted to begin with "Alternative".
*/
private function menuItemTitlesCasesHelper($case_no, $override = FALSE) {
diff --git a/modules/simpletest/tests/session.test b/modules/simpletest/tests/session.test
index e5ceb75..a0feffb 100644
--- a/modules/simpletest/tests/session.test
+++ b/modules/simpletest/tests/session.test
@@ -289,14 +289,14 @@ class SessionTestCase extends DrupalWebTestCase {
}
/**
- * Ensure that when running under https two session cookies are generated.
+ * Ensure that when running under HTTPS two session cookies are generated.
*/
class SessionHttpsTestCase extends DrupalWebTestCase {
public static function getInfo() {
return array(
- 'name' => 'Session https handling',
- 'description' => 'Ensure that when running under https two session cookies are generated.',
+ 'name' => 'Session HTTPS handling',
+ 'description' => 'Ensure that when running under HTTPS two session cookies are generated.',
'group' => 'Session'
);
}
@@ -384,7 +384,7 @@ class SessionHttpsTestCase extends DrupalWebTestCase {
$this->cookies = array();
if ($is_https) {
- // The functionality does not make sense when running on https.
+ // The functionality does not make sense when running on HTTPS.
return;
}
diff --git a/modules/system/system.api.php b/modules/system/system.api.php
index 3f445db..dda62f7 100644
--- a/modules/system/system.api.php
+++ b/modules/system/system.api.php
@@ -85,8 +85,8 @@ function hook_hook_info_alter(&$hooks) {
* - load hook: The name of the hook which should be invoked by
* DrupalDefaultEntityController:attachLoad(), for example 'node_load'.
* - uri callback: A function taking an entity as argument and returning the
- * uri elements of the entity, e.g. 'path' and 'options'. The actual entity
- * uri can be constructed by passing these elements to url().
+ * URI elements of the entity, e.g. 'path' and 'options'. The actual entity
+ * URI can be constructed by passing these elements to url().
* - label callback: (optional) A function taking an entity and an entity type
* as arguments and returning the label of the entity. The entity label is
* the main string associated with an entity; for example, the title of a
@@ -3742,7 +3742,7 @@ function hook_drupal_goto_alter(&$path, &$options, &$http_response_code) {
function hook_html_head_alter(&$head_elements) {
foreach ($head_elements as $key => $element) {
if (isset($element['#attributes']['rel']) && $element['#attributes']['rel'] == 'canonical') {
- // I want a custom canonical url.
+ // I want a custom canonical URL.
$head_elements[$key]['#attributes']['href'] = mymodule_canonical_url();
}
}
diff --git a/modules/system/system.install b/modules/system/system.install
index 220dfee..d468b05 100644
--- a/modules/system/system.install
+++ b/modules/system/system.install
@@ -2793,7 +2793,7 @@ function system_update_7061(&$sandbox) {
$scheme = file_default_scheme() . '://';
foreach ($node_revisions as $vid => $revision) {
foreach ($revision['file'][LANGUAGE_NONE] as $delta => $file) {
- // We will convert filepaths to uri using the default scheme
+ // We will convert filepaths to URI using the default scheme
// and stripping off the existing file directory path.
$file['uri'] = $scheme . preg_replace('!^' . preg_quote($basename) . '!', '', $file['filepath']);
$file['uri'] = file_stream_wrapper_uri_normalize($file['uri']);
diff --git a/modules/system/system.module b/modules/system/system.module
index 9897fb2..d64e782 100644
--- a/modules/system/system.module
+++ b/modules/system/system.module
@@ -1785,11 +1785,11 @@ function system_authorized_init($callback, $file, $arguments = array(), $page_ti
* @param array $options
* Optional array of options to pass to url().
* @return
- * The full URL to authorize.php, using https if available.
+ * The full URL to authorize.php, using HTTPS if available.
*/
function system_authorized_get_url(array $options = array()) {
global $base_url;
- // Force https if available, regardless of what the caller specifies.
+ // Force HTTPS if available, regardless of what the caller specifies.
$options['https'] = TRUE;
// We prefix with $base_url so we get a full path even if clean URLs are
// disabled.
diff --git a/modules/taxonomy/taxonomy-term.tpl.php b/modules/taxonomy/taxonomy-term.tpl.php
index e29b110..d410d1e 100644
--- a/modules/taxonomy/taxonomy-term.tpl.php
+++ b/modules/taxonomy/taxonomy-term.tpl.php
@@ -11,7 +11,7 @@
* such as render($content['field_example']). Use
* hide($content['field_example']) to temporarily suppress the printing of a
* given element.
- * - $term_url: Direct url of the current term.
+ * - $term_url: Direct URL of the current term.
* - $term_name: Name of the current term.
* - $classes: String of classes that can be used to style contextually through
* CSS. It can be manipulated through the variable $classes_array from
diff --git a/modules/taxonomy/taxonomy.module b/modules/taxonomy/taxonomy.module
index 63bbb2d..7814410 100644
--- a/modules/taxonomy/taxonomy.module
+++ b/modules/taxonomy/taxonomy.module
@@ -140,7 +140,7 @@ function taxonomy_entity_info() {
}
/**
- * Entity uri callback.
+ * Entity URI callback.
*/
function taxonomy_term_uri($term) {
return array(
diff --git a/modules/update/update.test b/modules/update/update.test
index 3286afb..b29f6ac 100644
--- a/modules/update/update.test
+++ b/modules/update/update.test
@@ -790,7 +790,7 @@ class UpdateCoreUnitTestCase extends DrupalUnitTestCase {
$url = _update_build_fetch_url($project, $site_key);
$this->assertEqual($url, $expected, "When site_key provided, '$url' should be '$expected'.");
- // http://drupal.org/node/1481156 test incorrect logic when url contains
+ // http://drupal.org/node/1481156 test incorrect logic when URL contains
// a question mark.
$project['info']['project status url'] = 'http://www.example.com/?project=';
$expected = 'http://www.example.com/?project=/' . $project['name'] . '/' . DRUPAL_CORE_COMPATIBILITY;
diff --git a/modules/user/user.module b/modules/user/user.module
index 47ac642..393ccc8 100644
--- a/modules/user/user.module
+++ b/modules/user/user.module
@@ -187,7 +187,7 @@ function user_entity_info() {
}
/**
- * Entity uri callback.
+ * Entity URI callback.
*/
function user_uri($user) {
return array(
diff --git a/scripts/drupal.sh b/scripts/drupal.sh
index 5d064f5..76bd750 100755
--- a/scripts/drupal.sh
+++ b/scripts/drupal.sh
@@ -113,7 +113,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);
diff --git a/scripts/run-tests.sh b/scripts/run-tests.sh
index f651f22..3345015 100755
--- a/scripts/run-tests.sh
+++ b/scripts/run-tests.sh
@@ -268,14 +268,14 @@ function simpletest_script_init($server_software) {
exit();
}
- // Get url from arguments.
+ // Get URL from arguments.
if (!empty($args['url'])) {
$parsed_url = parse_url($args['url']);
$host = $parsed_url['host'] . (isset($parsed_url['port']) ? ':' . $parsed_url['port'] : '');
$path = isset($parsed_url['path']) ? $parsed_url['path'] : '';
// If the passed URL schema is 'https' then setup the $_SERVER variables
- // properly so that testing will run under https.
+ // properly so that testing will run under HTTPS.
if ($parsed_url['scheme'] == 'https') {
$_SERVER['HTTPS'] = 'on';
}
diff --git a/themes/bartik/templates/node.tpl.php b/themes/bartik/templates/node.tpl.php
index 9115af2..df5b454 100644
--- a/themes/bartik/templates/node.tpl.php
+++ b/themes/bartik/templates/node.tpl.php
@@ -14,7 +14,7 @@
* - $date: Formatted creation date. Preprocess functions can reformat it by
* calling format_date() with the desired parameters on the $created variable.
* - $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.
* - $display_submitted: Whether submission information should be displayed.
* - $submitted: Submission information created from $name and $date during
* template_preprocess_node().