diff options
Diffstat (limited to 'includes')
| -rw-r--r-- | includes/bootstrap.inc | 10 | ||||
| -rw-r--r-- | includes/common.inc | 10 | ||||
| -rw-r--r-- | includes/database/database.inc | 6 | ||||
| -rw-r--r-- | includes/errors.inc | 2 | ||||
| -rw-r--r-- | includes/file.inc | 20 | ||||
| -rw-r--r-- | includes/language.inc | 3 | ||||
| -rw-r--r-- | includes/stream_wrappers.inc | 42 |
7 files changed, 46 insertions, 47 deletions
diff --git a/includes/bootstrap.inc b/includes/bootstrap.inc index 0bd4bcc1e..1c8b5c72d 100644 --- a/includes/bootstrap.inc +++ b/includes/bootstrap.inc @@ -8,7 +8,7 @@ /** * The current system version. */ -define('VERSION', '7.24'); +define('VERSION', '7.25-dev'); /** * Core API compatibility. @@ -244,7 +244,7 @@ define('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 */ define('DRUPAL_PHP_FUNCTION_PATTERN', '[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*'); @@ -278,7 +278,7 @@ define('DRUPAL_PHP_FUNCTION_PATTERN', '[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*' * 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 @@ -3294,8 +3294,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/includes/common.inc b/includes/common.inc index 0ab9c39e2..6f85b5248 100644 --- a/includes/common.inc +++ b/includes/common.inc @@ -1134,7 +1134,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') { @@ -1950,7 +1950,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 @@ -3719,7 +3719,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* @@ -4097,7 +4097,7 @@ function drupal_region_class($region) { * else being the same, JavaScript added by a call to drupal_add_js() that * happened later in the page request gets added to the page after one for * which drupal_add_js() happened earlier in the page request. - * - defer: If set to TRUE, the defer attribute is set on the <script> + * - defer: If set to TRUE, the defer attribute is set on the <script> * tag. Defaults to FALSE. * - cache: If set to FALSE, the JavaScript file is loaded anew on every page * call; in other words, it is not cached. Used only when 'type' references @@ -5155,7 +5155,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/includes/database/database.inc b/includes/database/database.inc index 339c9b03e..604dd4c7a 100644 --- a/includes/database/database.inc +++ b/includes/database/database.inc @@ -179,7 +179,7 @@ * 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 DatabaseConnection extends PDO { @@ -1986,7 +1986,7 @@ interface DatabaseStatementInterface 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 @@ -2005,7 +2005,7 @@ interface DatabaseStatementInterface 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/includes/errors.inc b/includes/errors.inc index fcf9ca85c..a9b7b5bde 100644 --- a/includes/errors.inc +++ b/includes/errors.inc @@ -9,7 +9,7 @@ * 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/includes/file.inc b/includes/file.inc index d52d02915..0ec69b701 100644 --- a/includes/file.inc +++ b/includes/file.inc @@ -754,10 +754,11 @@ function file_usage_delete(stdClass $file, $module, $type = NULL, $id = NULL, $c * stored in the database. This is a powerful function that in many ways * performs like an advanced version of copy(). * - Checks if $source and $destination are valid and readable/writable. - * - Checks that $source is not equal to $destination; if they are an error - * is reported. * - If file already exists in $destination either the call will error out, * replace the file or rename the file based on the $replace parameter. + * - If the $source and $destination are equal, the behavior depends on the + * $replace parameter. FILE_EXISTS_REPLACE will error out. FILE_EXISTS_RENAME + * will rename the file until the $destination is unique. * - Adds the new file to the files database. If the source file is a * temporary file, the resulting file will also be a temporary file. See * file_save_upload() for details on temporary files. @@ -852,10 +853,11 @@ function file_valid_uri($uri) { * This is a powerful function that in many ways performs like an advanced * version of copy(). * - Checks if $source and $destination are valid and readable/writable. - * - Checks that $source is not equal to $destination; if they are an error - * is reported. * - If file already exists in $destination either the call will error out, * replace the file or rename the file based on the $replace parameter. + * - If the $source and $destination are equal, the behavior depends on the + * $replace parameter. FILE_EXISTS_REPLACE will error out. FILE_EXISTS_RENAME + * will rename the file until the $destination is unique. * - Provides a fallback using realpaths if the move fails using stream * wrappers. This can occur because PHP's copy() function does not properly * support streams if safe_mode or open_basedir are enabled. See @@ -1143,7 +1145,7 @@ function file_munge_filename($filename, $extensions, $alerts = TRUE) { // Allow potentially insecure uploads for very savvy users and admin if (!variable_get('allow_insecure_uploads', 0)) { - // Remove any null bytes. See http://php.net/manual/en/security.filesystem.nullbytes.php + // Remove any null bytes. See http://php.net/manual/security.filesystem.nullbytes.php $filename = str_replace(chr(0), '', $filename); $whitelist = array_unique(explode(' ', trim($extensions))); @@ -1449,7 +1451,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: @@ -2212,7 +2214,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. @@ -2345,7 +2347,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. @@ -2376,7 +2378,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/includes/language.inc b/includes/language.inc index ea63948d9..8319596d4 100644 --- a/includes/language.inc +++ b/includes/language.inc @@ -78,7 +78,7 @@ define('LANGUAGE_NEGOTIATION_DEFAULT', 'language-default'); * function mymodule_language_negotiation_info_alter(&$negotiation_info) { * // Replace the core function with our own function. * module_load_include('language', 'inc', 'language.negotiation'); - * $negotiation_info[LANGUAGE_NEGOTIATION_URL]['callbacks']['negotiation'] = 'mymodule_from_url'; + * $negotiation_info[LANGUAGE_NEGOTIATION_URL]['callbacks']['language'] = 'mymodule_from_url'; * $negotiation_info[LANGUAGE_NEGOTIATION_URL]['file'] = drupal_get_path('module', 'mymodule') . '/mymodule.module'; * } * @@ -94,7 +94,6 @@ define('LANGUAGE_NEGOTIATION_DEFAULT', 'language-default'); * } * return $langcode; * } - * ?> * @endcode * * For more information, see diff --git a/includes/stream_wrappers.inc b/includes/stream_wrappers.inc index fa401c6b7..488293884 100644 --- a/includes/stream_wrappers.inc +++ b/includes/stream_wrappers.inc @@ -93,7 +93,7 @@ define('STREAM_WRAPPERS_LOCAL_NORMAL', STREAM_WRAPPERS_LOCAL | STREAM_WRAPPERS_N /** * 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 StreamWrapperInterface { public function stream_open($uri, $mode, $options, &$opened_url); @@ -401,7 +401,7 @@ abstract class DrupalLocalStreamWrapper implements DrupalStreamWrapperInterface * @return * 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; @@ -429,7 +429,7 @@ abstract class DrupalLocalStreamWrapper implements DrupalStreamWrapperInterface * @return * 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))) { @@ -448,7 +448,7 @@ abstract class DrupalLocalStreamWrapper implements DrupalStreamWrapperInterface * @return * 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); @@ -463,7 +463,7 @@ abstract class DrupalLocalStreamWrapper implements DrupalStreamWrapperInterface * @return * The number of bytes written (integer). * - * @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); @@ -475,7 +475,7 @@ abstract class DrupalLocalStreamWrapper implements DrupalStreamWrapperInterface * @return * 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); @@ -492,7 +492,7 @@ abstract class DrupalLocalStreamWrapper implements DrupalStreamWrapperInterface * @return * 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. @@ -506,7 +506,7 @@ abstract class DrupalLocalStreamWrapper implements DrupalStreamWrapperInterface * @return * 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); @@ -518,7 +518,7 @@ abstract class DrupalLocalStreamWrapper implements DrupalStreamWrapperInterface * @return * 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); @@ -531,7 +531,7 @@ abstract class DrupalLocalStreamWrapper implements DrupalStreamWrapperInterface * 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); @@ -543,7 +543,7 @@ abstract class DrupalLocalStreamWrapper implements DrupalStreamWrapperInterface * @return * 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); @@ -558,7 +558,7 @@ abstract class DrupalLocalStreamWrapper implements DrupalStreamWrapperInterface * @return * 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; @@ -576,7 +576,7 @@ abstract class DrupalLocalStreamWrapper implements DrupalStreamWrapperInterface * @return * 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)); @@ -622,7 +622,7 @@ abstract class DrupalLocalStreamWrapper implements DrupalStreamWrapperInterface * @return * 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; @@ -654,7 +654,7 @@ abstract class DrupalLocalStreamWrapper implements DrupalStreamWrapperInterface * @return * 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; @@ -678,7 +678,7 @@ abstract class DrupalLocalStreamWrapper implements DrupalStreamWrapperInterface * 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; @@ -704,7 +704,7 @@ abstract class DrupalLocalStreamWrapper implements DrupalStreamWrapperInterface * @return * 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; @@ -719,7 +719,7 @@ abstract class DrupalLocalStreamWrapper implements DrupalStreamWrapperInterface * @return * 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); @@ -731,7 +731,7 @@ abstract class DrupalLocalStreamWrapper implements DrupalStreamWrapperInterface * @return * 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); @@ -747,7 +747,7 @@ abstract class DrupalLocalStreamWrapper implements DrupalStreamWrapperInterface * @return * 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); @@ -788,8 +788,6 @@ class DrupalPublicStreamWrapper extends DrupalLocalStreamWrapper { * * Provides support for storing privately accessible files with the Drupal file * interface. - * - * Extends DrupalPublicStreamWrapper. */ class DrupalPrivateStreamWrapper extends DrupalLocalStreamWrapper { /** |