opdavies/presentations
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update WP and plugins

Browse source
This commit is contained in:
Oliver Davies 2019-04-16 20:56:22 +01:00
parent 10a4713229
commit 1fb77fc4ff
864 changed files with 101724 additions and 78262 deletions
Download patch file Download diff file Expand all files Collapse all files

84
wp-includes/class-wp-error.php
View file

@ -52,13 +52,15 @@ class WP_Error {
* @param mixed $data Optional. Error data.
*/
public function __construct( $code = '', $message = '', $data = '' ) {
if ( empty($code) )
if ( empty( $code ) ) {
return;
}
$this->errors[$code][] = $message;
$this->errors[ $code ][] = $message;
if ( ! empty($data) )
$this->error_data[$code] = $data;
if ( ! empty( $data ) ) {
$this->error_data[ $code ] = $data;
}
}
/**
@ -69,10 +71,11 @@ class WP_Error {
* @return array List of error codes, if available.
*/
public function get_error_codes() {
if ( empty($this->errors) )
if ( ! $this->has_errors() ) {
return array();
}
return array_keys($this->errors);
return array_keys( $this->errors );
}
/**
@ -85,8 +88,9 @@ class WP_Error {
public function get_error_code() {
$codes = $this->get_error_codes();
if ( empty($codes) )
if ( empty( $codes ) ) {
return '';
}
return $codes[0];
}
@ -99,20 +103,22 @@ class WP_Error {
* @param string|int $code Optional. Retrieve messages matching code, if exists.
* @return array Error strings on success, or empty array on failure (if using code parameter).
*/
public function get_error_messages($code = '') {
public function get_error_messages( $code = '' ) {
// Return all messages if no code specified.
if ( empty($code) ) {
if ( empty( $code ) ) {
$all_messages = array();
foreach ( (array) $this->errors as $code => $messages )
$all_messages = array_merge($all_messages, $messages);
foreach ( (array) $this->errors as $code => $messages ) {
$all_messages = array_merge( $all_messages, $messages );
}
return $all_messages;
}
if ( isset($this->errors[$code]) )
return $this->errors[$code];
else
if ( isset( $this->errors[ $code ] ) ) {
return $this->errors[ $code ];
} else {
return array();
}
}
/**
@ -126,12 +132,14 @@ class WP_Error {
* @param string|int $code Optional. Error code to retrieve message.
* @return string
*/
public function get_error_message($code = '') {
if ( empty($code) )
public function get_error_message( $code = '' ) {
if ( empty( $code ) ) {
$code = $this->get_error_code();
$messages = $this->get_error_messages($code);
if ( empty($messages) )
}
$messages = $this->get_error_messages( $code );
if ( empty( $messages ) ) {
return '';
}
return $messages[0];
}
@ -143,12 +151,28 @@ class WP_Error {
* @param string|int $code Optional. Error code.
* @return mixed Error data, if it exists.
*/
public function get_error_data($code = '') {
if ( empty($code) )
public function get_error_data( $code = '' ) {
if ( empty( $code ) ) {
$code = $this->get_error_code();
}
if ( isset($this->error_data[$code]) )
return $this->error_data[$code];
if ( isset( $this->error_data[ $code ] ) ) {
return $this->error_data[ $code ];
}
}
/**
* Verify if the instance contains errors.
*
* @since 5.1.0
*
* @return bool
*/
public function has_errors() {
if ( ! empty( $this->errors ) ) {
return true;
}
return false;
}
/**
@ -160,10 +184,11 @@ class WP_Error {
* @param string $message Error message.
* @param mixed $data Optional. Error data.
*/
public function add($code, $message, $data = '') {
$this->errors[$code][] = $message;
if ( ! empty($data) )
$this->error_data[$code] = $data;
public function add( $code, $message, $data = '' ) {
$this->errors[ $code ][] = $message;
if ( ! empty( $data ) ) {
$this->error_data[ $code ] = $data;
}
}
/**
@ -176,11 +201,12 @@ class WP_Error {
* @param mixed $data Error data.
* @param string|int $code Error code.
*/
public function add_data($data, $code = '') {
if ( empty($code) )
public function add_data( $data, $code = '' ) {
if ( empty( $code ) ) {
$code = $this->get_error_code();
}
$this->error_data[$code] = $data;
$this->error_data[ $code ] = $data;
}
/**