vhad/wordpress-develop
1
0
Fork 0
mirror of https://github.com/gosticks/wordpress-develop.git synced 2026-06-28 22:30:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Code is Poetry.

Browse Source 
WordPress' code just... wasn't.
This is now dealt with.

Props jrf, pento, netweb, GaryJ, jdgrimes, westonruter, Greg Sherwood from PHPCS, and everyone who's ever contributed to WPCS and PHPCS.
Fixes #41057.



git-svn-id: https://develop.svn.wordpress.org/trunk@42343 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Gary Pendergast
2017-11-30 23:09:33 +00:00
parent ec6a089f98
commit 8f95800d52
1103 changed files with 105981 additions and 78187 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
src/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 ( empty( $this->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,14 @@ 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 ];
}
}
/**
@@ -160,10 +170,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 +187,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;
}
/**