From 57a156ef960790ab2dc7fd9027d1ab6c8781f669 Mon Sep 17 00:00:00 2001 From: webchick Date: Sat, 24 Mar 2012 00:14:35 -0600 Subject: [PATCH] Issue #692366 by underq, bradweikel, willmoy, kid_icarus | foripepe: Fixed Stop forcing language/mirror for PHP manual links. --- core/includes/bootstrap.inc | 6 +-- core/includes/common.inc | 8 ++-- core/includes/errors.inc | 2 +- core/includes/file.inc | 8 ++-- core/lib/Drupal/Core/Config/DrupalConfig.php | 2 +- core/lib/Drupal/Core/Database/Connection.php | 2 +- core/lib/Drupal/Core/Database/Statement.php | 2 +- .../Core/Database/StatementInterface.php | 4 +- .../Drupal/Core/StreamWrapper/LocalStream.php | 38 +++++++++---------- .../PhpStreamWrapperInterface.php | 2 +- core/lib/Drupal/Core/Utility/CacheArray.php | 2 +- core/modules/entity/entity.class.inc | 4 +- core/modules/file/file.install | 4 +- core/modules/openid/openid.install | 4 +- .../simpletest/drupal_web_test_case.php | 2 +- core/modules/simpletest/simpletest.install | 6 +-- core/modules/simpletest/tests/ajax.test | 2 +- core/modules/simpletest/tests/file.test | 2 +- core/modules/system/system.api.php | 2 +- core/modules/system/system.tokens.inc | 2 +- sites/default/default.settings.php | 4 +- 21 files changed, 54 insertions(+), 54 deletions(-) diff --git a/core/includes/bootstrap.inc b/core/includes/bootstrap.inc index 6954c4d9b45b..c26ec86293be 100644 --- a/core/includes/bootstrap.inc +++ b/core/includes/bootstrap.inc @@ -265,7 +265,7 @@ const REGISTRY_WRITE_LOOKUP_CACHE = 2; /** * Regular expression to match PHP function names. * - * @see http://php.net/manual/en/language.functions.php + * @see http://php.net/manual/language.functions.php */ const DRUPAL_PHP_FUNCTION_PATTERN = '[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*'; @@ -3029,8 +3029,8 @@ function registry_update() { * However, the above line of code does not work, because PHP only allows static * variables to be initializied by literal values, and does not allow static * variables to be assigned to references. - * - http://php.net/manual/en/language.variables.scope.php#language.variables.scope.static - * - http://php.net/manual/en/language.variables.scope.php#language.variables.scope.references + * - http://php.net/manual/language.variables.scope.php#language.variables.scope.static + * - http://php.net/manual/language.variables.scope.php#language.variables.scope.references * The example below shows the syntax needed to work around both limitations. * For benchmarks and more information, see http://drupal.org/node/619666. * diff --git a/core/includes/common.inc b/core/includes/common.inc index 5a146a8b097e..7ce19944b5e4 100644 --- a/core/includes/common.inc +++ b/core/includes/common.inc @@ -1059,7 +1059,7 @@ function _fix_gpc_magic(&$item) { * @param $key * The key for the item within $_FILES. * - * @see http://php.net/manual/en/features.file-upload.php#42280 + * @see http://php.net/manual/features.file-upload.php#42280 */ function _fix_gpc_magic_files(&$item, $key) { if ($key != 'tmp_name') { @@ -1883,7 +1883,7 @@ function format_interval($interval, $granularity = 2, $langcode = NULL) { * get interpreted as date format characters. * @param $timezone * (optional) Time zone identifier, as described at - * http://php.net/manual/en/timezones.php Defaults to the time zone used to + * http://php.net/manual/timezones.php Defaults to the time zone used to * display the page. * @param $langcode * (optional) Language code to translate to. Defaults to the language used to @@ -3644,7 +3644,7 @@ function drupal_load_stylesheet_content($contents, $optimize = FALSE) { // Remove certain whitespace. // There are different conditions for removing leading and trailing // whitespace. - // @see http://php.net/manual/en/regexp.reference.subpatterns.php + // @see http://php.net/manual/regexp.reference.subpatterns.php $contents = preg_replace('< # Strip leading and trailing whitespace. \s*([@{};,])\s* @@ -5193,7 +5193,7 @@ function _drupal_bootstrap_full() { * client without gzip support. * * Page compression requires the PHP zlib extension - * (http://php.net/manual/en/ref.zlib.php). + * (http://php.net/manual/ref.zlib.php). * * @see drupal_page_header() */ diff --git a/core/includes/errors.inc b/core/includes/errors.inc index bfdd71247544..0524170dfbf3 100644 --- a/core/includes/errors.inc +++ b/core/includes/errors.inc @@ -24,7 +24,7 @@ const ERROR_REPORTING_DISPLAY_ALL = 2; * Maps PHP error constants to watchdog severity levels. * * The error constants are documented at - * http://php.net/manual/en/errorfunc.constants.php + * http://php.net/manual/errorfunc.constants.php * * @ingroup logging_severity_levels */ diff --git a/core/includes/file.inc b/core/includes/file.inc index 2771f62cab9f..eaff634e2778 100644 --- a/core/includes/file.inc +++ b/core/includes/file.inc @@ -1494,7 +1494,7 @@ function file_save_upload($source, $validators = array(), $destination = FALSE, // Check for file upload errors and return FALSE if a lower level system // error occurred. For a complete list of errors: - // See http://php.net/manual/en/features.file-upload.errors.php. + // See http://php.net/manual/features.file-upload.errors.php. switch ($_FILES['files']['error'][$source]) { case UPLOAD_ERR_INI_SIZE: case UPLOAD_ERR_FORM_SIZE: @@ -2253,7 +2253,7 @@ function drupal_chmod($uri, $mode = NULL) { * @param $uri * A URI or pathname. * @param $context - * Refer to http://php.net/manual/en/ref.stream.php + * Refer to http://php.net/manual/ref.stream.php * * @return * Boolean TRUE on success, or FALSE on failure. @@ -2388,7 +2388,7 @@ function drupal_basename($uri, $suffix = NULL) { * @param $recursive * Default to FALSE. * @param $context - * Refer to http://php.net/manual/en/ref.stream.php + * Refer to http://php.net/manual/ref.stream.php * * @return * Boolean TRUE on success, or FALSE on failure. @@ -2419,7 +2419,7 @@ function drupal_mkdir($uri, $mode = NULL, $recursive = FALSE, $context = NULL) { * @param $uri * A URI or pathname. * @param $context - * Refer to http://php.net/manual/en/ref.stream.php + * Refer to http://php.net/manual/ref.stream.php * * @return * Boolean TRUE on success, or FALSE on failure. diff --git a/core/lib/Drupal/Core/Config/DrupalConfig.php b/core/lib/Drupal/Core/Config/DrupalConfig.php index 2f688b44d711..9fc33aac20f9 100644 --- a/core/lib/Drupal/Core/Config/DrupalConfig.php +++ b/core/lib/Drupal/Core/Config/DrupalConfig.php @@ -81,7 +81,7 @@ class DrupalConfig { * cause issues with Booleans, which are casted to "1" (TRUE) or "0" (FALSE). * In particular, code relying on === or !== will no longer function properly. * - * @see http://php.net/manual/en/language.operators.comparison.php. + * @see http://php.net/manual/language.operators.comparison.php. * * @return * The data that was requested. diff --git a/core/lib/Drupal/Core/Database/Connection.php b/core/lib/Drupal/Core/Database/Connection.php index 6e9e44aec146..3805864926f9 100644 --- a/core/lib/Drupal/Core/Database/Connection.php +++ b/core/lib/Drupal/Core/Database/Connection.php @@ -21,7 +21,7 @@ use PDOException; * concrete implementation of it to support special handling required by that * database. * - * @see http://php.net/manual/en/book.pdo.php + * @see http://php.net/manual/book.pdo.php */ abstract class Connection extends PDO { diff --git a/core/lib/Drupal/Core/Database/Statement.php b/core/lib/Drupal/Core/Database/Statement.php index 7b23ed3d6a04..c5b1735e33c8 100644 --- a/core/lib/Drupal/Core/Database/Statement.php +++ b/core/lib/Drupal/Core/Database/Statement.php @@ -19,7 +19,7 @@ use PDOStatement; * driver needs to set a custom statement class, it may do so in its * constructor. * - * @see http://us.php.net/pdostatement + * @see http://php.net/pdostatement */ class Statement extends PDOStatement implements StatementInterface { diff --git a/core/lib/Drupal/Core/Database/StatementInterface.php b/core/lib/Drupal/Core/Database/StatementInterface.php index 2fb57fcf14a7..7f1ca4a09172 100644 --- a/core/lib/Drupal/Core/Database/StatementInterface.php +++ b/core/lib/Drupal/Core/Database/StatementInterface.php @@ -64,7 +64,7 @@ interface StatementInterface extends Traversable { /** * Sets the default fetch mode for this statement. * - * See http://php.net/manual/en/pdo.constants.php for the definition of the + * See http://php.net/manual/pdo.constants.php for the definition of the * constants used. * * @param $mode @@ -83,7 +83,7 @@ interface StatementInterface extends Traversable { /** * Fetches the next row from a result set. * - * See http://php.net/manual/en/pdo.constants.php for the definition of the + * See http://php.net/manual/pdo.constants.php for the definition of the * constants used. * * @param $mode diff --git a/core/lib/Drupal/Core/StreamWrapper/LocalStream.php b/core/lib/Drupal/Core/StreamWrapper/LocalStream.php index 9f2b95ded36d..0cd76e0c8c1d 100644 --- a/core/lib/Drupal/Core/StreamWrapper/LocalStream.php +++ b/core/lib/Drupal/Core/StreamWrapper/LocalStream.php @@ -189,7 +189,7 @@ abstract class LocalStream implements StreamWrapperInterface { * @return bool * Returns TRUE if file was opened successfully. * - * @see http://php.net/manual/en/streamwrapper.stream-open.php + * @see http://php.net/manual/streamwrapper.stream-open.php */ public function stream_open($uri, $mode, $options, &$opened_path) { $this->uri = $uri; @@ -217,7 +217,7 @@ abstract class LocalStream implements StreamWrapperInterface { * @return bool * Always returns TRUE at the present time. * - * @see http://php.net/manual/en/streamwrapper.stream-lock.php + * @see http://php.net/manual/streamwrapper.stream-lock.php */ public function stream_lock($operation) { if (in_array($operation, array(LOCK_SH, LOCK_EX, LOCK_UN, LOCK_NB))) { @@ -236,7 +236,7 @@ abstract class LocalStream implements StreamWrapperInterface { * @return string|bool * The string that was read, or FALSE in case of an error. * - * @see http://php.net/manual/en/streamwrapper.stream-read.php + * @see http://php.net/manual/streamwrapper.stream-read.php */ public function stream_read($count) { return fread($this->handle, $count); @@ -251,7 +251,7 @@ abstract class LocalStream implements StreamWrapperInterface { * @return int * The number of bytes written. * - * @see http://php.net/manual/en/streamwrapper.stream-write.php + * @see http://php.net/manual/streamwrapper.stream-write.php */ public function stream_write($data) { return fwrite($this->handle, $data); @@ -263,7 +263,7 @@ abstract class LocalStream implements StreamWrapperInterface { * @return bool * TRUE if end-of-file has been reached. * - * @see http://php.net/manual/en/streamwrapper.stream-eof.php + * @see http://php.net/manual/streamwrapper.stream-eof.php */ public function stream_eof() { return feof($this->handle); @@ -280,7 +280,7 @@ abstract class LocalStream implements StreamWrapperInterface { * @return bool * TRUE on success. * - * @see http://php.net/manual/en/streamwrapper.stream-seek.php + * @see http://php.net/manual/streamwrapper.stream-seek.php */ public function stream_seek($offset, $whence) { // fseek returns 0 on success and -1 on a failure. @@ -294,7 +294,7 @@ abstract class LocalStream implements StreamWrapperInterface { * @return bool * TRUE if data was successfully stored (or there was no data to store). * - * @see http://php.net/manual/en/streamwrapper.stream-flush.php + * @see http://php.net/manual/streamwrapper.stream-flush.php */ public function stream_flush() { return fflush($this->handle); @@ -306,7 +306,7 @@ abstract class LocalStream implements StreamWrapperInterface { * @return bool * The current offset in bytes from the beginning of file. * - * @see http://php.net/manual/en/streamwrapper.stream-tell.php + * @see http://php.net/manual/streamwrapper.stream-tell.php */ public function stream_tell() { return ftell($this->handle); @@ -319,7 +319,7 @@ abstract class LocalStream implements StreamWrapperInterface { * An array with file status, or FALSE in case of an error - see fstat() * for a description of this array. * - * @see http://php.net/manual/en/streamwrapper.stream-stat.php + * @see http://php.net/manual/streamwrapper.stream-stat.php */ public function stream_stat() { return fstat($this->handle); @@ -331,7 +331,7 @@ abstract class LocalStream implements StreamWrapperInterface { * @return bool * TRUE if stream was successfully closed. * - * @see http://php.net/manual/en/streamwrapper.stream-close.php + * @see http://php.net/manual/streamwrapper.stream-close.php */ public function stream_close() { return fclose($this->handle); @@ -346,7 +346,7 @@ abstract class LocalStream implements StreamWrapperInterface { * @return bool * TRUE if resource was successfully deleted. * - * @see http://php.net/manual/en/streamwrapper.unlink.php + * @see http://php.net/manual/streamwrapper.unlink.php */ public function unlink($uri) { $this->uri = $uri; @@ -364,7 +364,7 @@ abstract class LocalStream implements StreamWrapperInterface { * @return bool * TRUE if file was successfully renamed. * - * @see http://php.net/manual/en/streamwrapper.rename.php + * @see http://php.net/manual/streamwrapper.rename.php */ public function rename($from_uri, $to_uri) { return rename($this->getLocalPath($from_uri), $this->getLocalPath($to_uri)); @@ -410,7 +410,7 @@ abstract class LocalStream implements StreamWrapperInterface { * @return bool * TRUE if directory was successfully created. * - * @see http://php.net/manual/en/streamwrapper.mkdir.php + * @see http://php.net/manual/streamwrapper.mkdir.php */ public function mkdir($uri, $mode, $options) { $this->uri = $uri; @@ -442,7 +442,7 @@ abstract class LocalStream implements StreamWrapperInterface { * @return bool * TRUE if directory was successfully removed. * - * @see http://php.net/manual/en/streamwrapper.rmdir.php + * @see http://php.net/manual/streamwrapper.rmdir.php */ public function rmdir($uri, $options) { $this->uri = $uri; @@ -466,7 +466,7 @@ abstract class LocalStream implements StreamWrapperInterface { * An array with file status, or FALSE in case of an error - see fstat() * for a description of this array. * - * @see http://php.net/manual/en/streamwrapper.url-stat.php + * @see http://php.net/manual/streamwrapper.url-stat.php */ public function url_stat($uri, $flags) { $this->uri = $uri; @@ -492,7 +492,7 @@ abstract class LocalStream implements StreamWrapperInterface { * @return bool * TRUE on success. * - * @see http://php.net/manual/en/streamwrapper.dir-opendir.php + * @see http://php.net/manual/streamwrapper.dir-opendir.php */ public function dir_opendir($uri, $options) { $this->uri = $uri; @@ -507,7 +507,7 @@ abstract class LocalStream implements StreamWrapperInterface { * @return string * The next filename, or FALSE if there are no more files in the directory. * - * @see http://php.net/manual/en/streamwrapper.dir-readdir.php + * @see http://php.net/manual/streamwrapper.dir-readdir.php */ public function dir_readdir() { return readdir($this->handle); @@ -519,7 +519,7 @@ abstract class LocalStream implements StreamWrapperInterface { * @return bool * TRUE on success. * - * @see http://php.net/manual/en/streamwrapper.dir-rewinddir.php + * @see http://php.net/manual/streamwrapper.dir-rewinddir.php */ public function dir_rewinddir() { rewinddir($this->handle); @@ -535,7 +535,7 @@ abstract class LocalStream implements StreamWrapperInterface { * @return bool * TRUE on success. * - * @see http://php.net/manual/en/streamwrapper.dir-closedir.php + * @see http://php.net/manual/streamwrapper.dir-closedir.php */ public function dir_closedir() { closedir($this->handle); diff --git a/core/lib/Drupal/Core/StreamWrapper/PhpStreamWrapperInterface.php b/core/lib/Drupal/Core/StreamWrapper/PhpStreamWrapperInterface.php index 4cf41e08730a..fad393fb0011 100644 --- a/core/lib/Drupal/Core/StreamWrapper/PhpStreamWrapperInterface.php +++ b/core/lib/Drupal/Core/StreamWrapper/PhpStreamWrapperInterface.php @@ -10,7 +10,7 @@ namespace Drupal\Core\StreamWrapper; /** * Defines a generic PHP stream wrapper interface. * - * @see http://www.php.net/manual/en/class.streamwrapper.php + * @see http://www.php.net/manual/class.streamwrapper.php */ interface PhpStreamWrapperInterface { public function stream_open($uri, $mode, $options, &$opened_url); diff --git a/core/lib/Drupal/Core/Utility/CacheArray.php b/core/lib/Drupal/Core/Utility/CacheArray.php index 8f98b72f0d7a..b730db2b7f0a 100644 --- a/core/lib/Drupal/Core/Utility/CacheArray.php +++ b/core/lib/Drupal/Core/Utility/CacheArray.php @@ -39,7 +39,7 @@ use ArrayAccess; * error, and $var will be populated with the contents of $object['foo'], but * that data will be passed by value, not reference. For more information on * the PHP limitation, see the note in the official PHP documentation atá - * http://php.net/manual/en/arrayaccess.offsetget.php on + * http://php.net/manual/arrayaccess.offsetget.php on * ArrayAccess::offsetGet(). * * By default, the class accounts for caches where calling functions might diff --git a/core/modules/entity/entity.class.inc b/core/modules/entity/entity.class.inc index 1dec8ee26378..9b13256c41d2 100644 --- a/core/modules/entity/entity.class.inc +++ b/core/modules/entity/entity.class.inc @@ -279,7 +279,7 @@ class Entity implements EntityInterface { /** * Serializes only what is necessary. * - * See @link http://www.php.net/manual/en/language.oop5.magic.php#language.oop5.magic.sleep PHP Magic Methods @endlink. + * See @link http://www.php.net/manual/language.oop5.magic.php#language.oop5.magic.sleep PHP Magic Methods @endlink. */ public function __sleep() { $vars = get_object_vars($this); @@ -292,7 +292,7 @@ class Entity implements EntityInterface { /** * Invokes setUp() on unserialization. * - * See @link http://www.php.net/manual/en/language.oop5.magic.php#language.oop5.magic.sleep PHP Magic Methods @endlink + * See @link http://www.php.net/manual/language.oop5.magic.php#language.oop5.magic.sleep PHP Magic Methods @endlink */ public function __wakeup() { $this->setUp(); diff --git a/core/modules/file/file.install b/core/modules/file/file.install index 47ee4fd0014b..dff930b5f1d1 100644 --- a/core/modules/file/file.install +++ b/core/modules/file/file.install @@ -74,11 +74,11 @@ function file_requirements($phase) { } elseif (!$implementation) { $value = t('Not enabled'); - $description = t('Your server is capable of displaying file upload progress, but does not have the required libraries. It is recommended to install the PECL uploadprogress library (preferred) or to install APC.'); + $description = t('Your server is capable of displaying file upload progress, but does not have the required libraries. It is recommended to install the PECL uploadprogress library (preferred) or to install APC.'); $severity = REQUIREMENT_INFO; } elseif ($implementation == 'apc') { - $value = t('Enabled (APC RFC1867)'); + $value = t('Enabled (APC RFC1867)'); $description = t('Your server is capable of displaying file upload progress using APC RFC1867. Note that only one upload at a time is supported. It is recommended to use the PECL uploadprogress library if possible.'); $severity = REQUIREMENT_OK; } diff --git a/core/modules/openid/openid.install b/core/modules/openid/openid.install index 2df39aa6969f..830f9905f176 100644 --- a/core/modules/openid/openid.install +++ b/core/modules/openid/openid.install @@ -95,14 +95,14 @@ function openid_requirements($phase) { $requirements['openid_math'] = array( 'value' => t('Not installed'), 'severity' => REQUIREMENT_ERROR, - 'description' => t('OpenID suggests the use of either the GMP Math (recommended for performance) or BC Math libraries to enable OpenID associations.', array('@gmp' => 'http://php.net/manual/en/book.gmp.php', '@bc' => 'http://www.php.net/manual/en/book.bc.php')), + 'description' => t('OpenID suggests the use of either the GMP Math (recommended for performance) or BC Math libraries to enable OpenID associations.', array('@gmp' => 'http://php.net/manual/book.gmp.php', '@bc' => 'http://www.php.net/manual/book.bc.php')), ); } elseif (!function_exists('gmp_add')) { $requirements['openid_math'] = array( 'value' => t('Not optimized'), 'severity' => REQUIREMENT_WARNING, - 'description' => t('OpenID suggests the use of the GMP Math library for PHP for optimal performance. Check the GMP Math Library documentation for installation instructions.', array('@url' => 'http://www.php.net/manual/en/book.gmp.php')), + 'description' => t('OpenID suggests the use of the GMP Math library for PHP for optimal performance. Check the GMP Math Library documentation for installation instructions.', array('@url' => 'http://www.php.net/manual/book.gmp.php')), ); } else { diff --git a/core/modules/simpletest/drupal_web_test_case.php b/core/modules/simpletest/drupal_web_test_case.php index ded4ad0da0cd..a5a27ecf9ec2 100644 --- a/core/modules/simpletest/drupal_web_test_case.php +++ b/core/modules/simpletest/drupal_web_test_case.php @@ -2429,7 +2429,7 @@ class DrupalWebTestCase extends DrupalTestCase { * @return * The return value of the xpath search. For details on the xpath string * format and return values see the SimpleXML documentation, - * http://us.php.net/manual/function.simplexml-element-xpath.php. + * http://php.net/manual/function.simplexml-element-xpath.php. */ protected function xpath($xpath, array $arguments = array()) { if ($this->parse()) { diff --git a/core/modules/simpletest/simpletest.install b/core/modules/simpletest/simpletest.install index 96cc0112f7f9..f8f4d87acfcc 100644 --- a/core/modules/simpletest/simpletest.install +++ b/core/modules/simpletest/simpletest.install @@ -28,7 +28,7 @@ function simpletest_requirements($phase) { ); if (!$has_curl) { $requirements['curl']['severity'] = REQUIREMENT_ERROR; - $requirements['curl']['description'] = $t('The testing framework could not be installed because the PHP cURL library is not available.', array('@curl_url' => 'http://php.net/manual/en/curl.setup.php')); + $requirements['curl']['description'] = $t('The testing framework could not be installed because the PHP cURL library is not available.', array('@curl_url' => 'http://php.net/manual/curl.setup.php')); } $requirements['hash'] = array( 'title' => $t('hash'), @@ -36,7 +36,7 @@ function simpletest_requirements($phase) { ); if (!$has_hash) { $requirements['hash']['severity'] = REQUIREMENT_ERROR; - $requirements['hash']['description'] = $t('The testing framework could not be installed because the PHP hash extension is disabled.', array('@hash_url' => 'http://php.net/manual/en/book.hash.php')); + $requirements['hash']['description'] = $t('The testing framework could not be installed because the PHP hash extension is disabled.', array('@hash_url' => 'http://php.net/manual/book.hash.php')); } $requirements['php_domdocument'] = array( @@ -57,7 +57,7 @@ function simpletest_requirements($phase) { ); if ($open_basedir) { $requirements['php_open_basedir']['severity'] = REQUIREMENT_ERROR; - $requirements['php_open_basedir']['description'] = $t('The testing framework requires the PHP open_basedir restriction to be disabled. Check your webserver configuration or contact your web host.', array('@open_basedir-url' => 'http://php.net/manual/en/ini.core.php#ini.open-basedir')); + $requirements['php_open_basedir']['description'] = $t('The testing framework requires the PHP open_basedir restriction to be disabled. Check your webserver configuration or contact your web host.', array('@open_basedir-url' => 'http://php.net/manual/ini.core.php#ini.open-basedir')); } // Check the current memory limit. If it is set too low, SimpleTest will fail diff --git a/core/modules/simpletest/tests/ajax.test b/core/modules/simpletest/tests/ajax.test index 3184add156ca..4f254f81f382 100644 --- a/core/modules/simpletest/tests/ajax.test +++ b/core/modules/simpletest/tests/ajax.test @@ -44,7 +44,7 @@ class AJAXTestCase extends DrupalWebTestCase { // If the command has additional data that we're not testing for, do not // consider that a failure. Also, == instead of ===, because we don't // require the key/value pairs to be in any particular order - // (http://www.php.net/manual/en/language.operators.array.php). + // (http://www.php.net/manual/language.operators.array.php). if (array_intersect_key($command, $needle) == $needle) { $found = TRUE; break; diff --git a/core/modules/simpletest/tests/file.test b/core/modules/simpletest/tests/file.test index 5b6a6f456aec..c5eced152c1f 100644 --- a/core/modules/simpletest/tests/file.test +++ b/core/modules/simpletest/tests/file.test @@ -2413,7 +2413,7 @@ class FileDownloadTest extends FileTestCase { // Tilde (~) is excluded from this test because it is encoded by // rawurlencode() in PHP 5.2 but not in PHP 5.3, as per RFC 3986. - // @see http://www.php.net/manual/en/function.rawurlencode.php#86506 + // @see http://www.php.net/manual/function.rawurlencode.php#86506 $basename = " -._!$'\"()*@[]?&+%#,;=:\n\x00" . // "Special" ASCII characters. "%23%25%26%2B%2F%3F" . // Characters that look like a percent-escaped string. "éøïвβ中國書۞"; // Characters from various non-ASCII alphabets. diff --git a/core/modules/system/system.api.php b/core/modules/system/system.api.php index 5d600110447a..00c75c749f06 100644 --- a/core/modules/system/system.api.php +++ b/core/modules/system/system.api.php @@ -3613,7 +3613,7 @@ function hook_date_format_types_alter(&$types) { * declared in an implementation of hook_date_format_types(). * - 'format': A PHP date format string to use when formatting dates. It * can contain any of the formatting options described at - * http://php.net/manual/en/function.date.php + * http://php.net/manual/function.date.php * - 'locales': (optional) An array of 2 and 5 character locale codes, * defining which locales this format applies to (for example, 'en', * 'en-us', etc.). If your date format is not language-specific, leave this diff --git a/core/modules/system/system.tokens.inc b/core/modules/system/system.tokens.inc index fa95661eda3a..249289077e1a 100644 --- a/core/modules/system/system.tokens.inc +++ b/core/modules/system/system.tokens.inc @@ -67,7 +67,7 @@ function system_token_info() { ); $date['custom'] = array( 'name' => t("Custom format"), - 'description' => t("A date in a custom format. See !php-date for details.", array('!php-date' => l(t('the PHP documentation'), 'http://php.net/manual/en/function.date.php'))), + 'description' => t("A date in a custom format. See !php-date for details.", array('!php-date' => l(t('the PHP documentation'), 'http://php.net/manual/function.date.php'))), ); $date['since'] = array( 'name' => t("Time-since"), diff --git a/sites/default/default.settings.php b/sites/default/default.settings.php index 7531a98ac24c..4f3fab8ad699 100755 --- a/sites/default/default.settings.php +++ b/sites/default/default.settings.php @@ -285,7 +285,7 @@ $config_signature_key = ''; * * To see what PHP settings are possible, including whether they can be set at * runtime (by using ini_set()), read the PHP documentation: - * http://www.php.net/manual/en/ini.list.php + * http://php.net/manual/ini.list.php * See drupal_initialize_variables() in includes/bootstrap.inc for required * runtime settings and the .htaccess file for non-runtime settings. Settings * defined there should not be duplicated here so as to avoid conflict issues. @@ -321,7 +321,7 @@ ini_set('session.cookie_lifetime', 2000000); * output filter may not have sufficient memory to process it. If you * experience this issue, you may wish to uncomment the following two lines * and increase the limits of these variables. For more information, see - * http://php.net/manual/en/pcre.configuration.php. + * http://php.net/manual/pcre.configuration.php. */ # ini_set('pcre.backtrack_limit', 200000); # ini_set('pcre.recursion_limit', 200000);