diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-09-19 04:51:22 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-09-19 04:51:22 +0000 |
| commit | fc0a79914946dac00ccd51b1aacffe267de7210e (patch) | |
| tree | 1403384efbfe8f8776ff60aaa40f7d535c02c822 /wp-content | |
| parent | Releasing progress-linux version 6.5.5+dfsg1-1~progress7.99u1. (diff) | |
| download | wordpress-fc0a79914946dac00ccd51b1aacffe267de7210e.tar.xz wordpress-fc0a79914946dac00ccd51b1aacffe267de7210e.zip | |
Merging upstream version 6.6.1+dfsg1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'wp-content')
66 files changed, 398 insertions, 292 deletions
diff --git a/wp-content/plugins/akismet/akismet.php b/wp-content/plugins/akismet/akismet.php index b62fddd..bca9a4a 100644 --- a/wp-content/plugins/akismet/akismet.php +++ b/wp-content/plugins/akismet/akismet.php @@ -6,7 +6,7 @@ Plugin Name: Akismet Anti-spam: Spam Protection Plugin URI: https://akismet.com/ Description: Used by millions, Akismet is quite possibly the best way in the world to <strong>protect your blog from spam</strong>. Akismet Anti-spam keeps your site protected even while you sleep. To get started: activate the Akismet plugin and then go to your Akismet Settings page to set up your API key. -Version: 5.3.2 +Version: 5.3.3 Requires at least: 5.8 Requires PHP: 5.6.20 Author: Automattic - Anti-spam Team @@ -39,7 +39,7 @@ if ( !function_exists( 'add_action' ) ) { exit; } -define( 'AKISMET_VERSION', '5.3.2' ); +define( 'AKISMET_VERSION', '5.3.3' ); define( 'AKISMET__MINIMUM_WP_VERSION', '5.8' ); define( 'AKISMET__PLUGIN_DIR', plugin_dir_path( __FILE__ ) ); define( 'AKISMET_DELETE_LIMIT', 10000 ); @@ -47,22 +47,22 @@ define( 'AKISMET_DELETE_LIMIT', 10000 ); register_activation_hook( __FILE__, array( 'Akismet', 'plugin_activation' ) ); register_deactivation_hook( __FILE__, array( 'Akismet', 'plugin_deactivation' ) ); -require_once( AKISMET__PLUGIN_DIR . 'class.akismet.php' ); -require_once( AKISMET__PLUGIN_DIR . 'class.akismet-widget.php' ); -require_once( AKISMET__PLUGIN_DIR . 'class.akismet-rest-api.php' ); +require_once AKISMET__PLUGIN_DIR . 'class.akismet.php'; +require_once AKISMET__PLUGIN_DIR . 'class.akismet-widget.php'; +require_once AKISMET__PLUGIN_DIR . 'class.akismet-rest-api.php'; add_action( 'init', array( 'Akismet', 'init' ) ); add_action( 'rest_api_init', array( 'Akismet_REST_API', 'init' ) ); if ( is_admin() || ( defined( 'WP_CLI' ) && WP_CLI ) ) { - require_once( AKISMET__PLUGIN_DIR . 'class.akismet-admin.php' ); + require_once AKISMET__PLUGIN_DIR . 'class.akismet-admin.php'; add_action( 'init', array( 'Akismet_Admin', 'init' ) ); } //add wrapper class around deprecated akismet functions that are referenced elsewhere -require_once( AKISMET__PLUGIN_DIR . 'wrapper.php' ); +require_once AKISMET__PLUGIN_DIR . 'wrapper.php'; if ( defined( 'WP_CLI' ) && WP_CLI ) { - require_once( AKISMET__PLUGIN_DIR . 'class.akismet-cli.php' ); + require_once AKISMET__PLUGIN_DIR . 'class.akismet-cli.php'; } diff --git a/wp-content/plugins/akismet/class.akismet-admin.php b/wp-content/plugins/akismet/class.akismet-admin.php index dd39104..d1dabcf 100644 --- a/wp-content/plugins/akismet/class.akismet-admin.php +++ b/wp-content/plugins/akismet/class.akismet-admin.php @@ -533,9 +533,13 @@ class Akismet_Admin { } public static function comment_row_action( $a, $comment ) { - $akismet_result = get_comment_meta( $comment->comment_ID, 'akismet_result', true ); + $akismet_result = get_comment_meta( $comment->comment_ID, 'akismet_result', true ); + if ( ! $akismet_result && get_comment_meta( $comment->comment_ID, 'akismet_skipped', true ) ) { + $akismet_result = 'skipped'; // Akismet chose to skip the comment-check request. + } + $akismet_error = get_comment_meta( $comment->comment_ID, 'akismet_error', true ); - $user_result = get_comment_meta( $comment->comment_ID, 'akismet_user_result', true); + $user_result = get_comment_meta( $comment->comment_ID, 'akismet_user_result', true ); $comment_status = wp_get_comment_status( $comment->comment_ID ); $desc = null; if ( $akismet_error ) { @@ -679,6 +683,12 @@ class Akismet_Admin { case 'webhook-ham-noaction': $message = esc_html( __( 'Akismet cleared this comment during a recheck. It did not update the comment status because it had already been modified by another user or plugin.', 'akismet' ) ); break; + case 'akismet-skipped': + $message = esc_html( __( 'This comment was not sent to Akismet when it was submitted because it was caught by something else.', 'akismet' ) ); + break; + case 'akismet-skipped-disallowed': + $message = esc_html( __( 'This comment was not sent to Akismet when it was submitted because it was caught by the comment disallowed list.', 'akismet' ) ); + break; default: if ( preg_match( '/^status-changed/', $row['event'] ) ) { // Half of these used to be saved without the dash after 'status-changed'. @@ -897,7 +907,14 @@ class Akismet_Admin { $response = Akismet::http_post( Akismet::build_query( $request_args ), 'get-stats' ); if ( ! empty( $response[1] ) ) { - $stat_totals[$interval] = json_decode( $response[1] ); + $data = json_decode( $response[1] ); + /* + * The json decoded response should be an object. If it's not an object, something's wrong, and the data + * shouldn't be added to the stats_totals array. + */ + if ( is_object( $data ) ) { + $stat_totals[ $interval ] = $data; + } } } @@ -952,14 +969,15 @@ class Akismet_Admin { public static function get_usage_limit_alert_data() { return array( - 'type' => 'usage-limit', - 'code' => (int) get_option( 'akismet_alert_code' ), - 'msg' => get_option( 'akismet_alert_msg' ), - 'api_calls' => get_option( 'akismet_alert_api_calls' ), - 'usage_limit' => get_option( 'akismet_alert_usage_limit' ), - 'upgrade_plan' => get_option( 'akismet_alert_upgrade_plan' ), - 'upgrade_url' => get_option( 'akismet_alert_upgrade_url' ), - 'upgrade_type' => get_option( 'akismet_alert_upgrade_type' ), + 'type' => 'usage-limit', + 'code' => (int) get_option( 'akismet_alert_code' ), + 'msg' => get_option( 'akismet_alert_msg' ), + 'api_calls' => get_option( 'akismet_alert_api_calls' ), + 'usage_limit' => get_option( 'akismet_alert_usage_limit' ), + 'upgrade_plan' => get_option( 'akismet_alert_upgrade_plan' ), + 'upgrade_url' => get_option( 'akismet_alert_upgrade_url' ), + 'upgrade_type' => get_option( 'akismet_alert_upgrade_type' ), + 'upgrade_via_support' => get_option( 'akismet_alert_upgrade_via_support' ) === 'true', ); } @@ -1107,6 +1125,12 @@ class Akismet_Admin { $alert_code = get_option( 'akismet_alert_code' ); if ( isset( Akismet::$limit_notices[ $alert_code ] ) ) { $notices[] = self::get_usage_limit_alert_data(); + } elseif ( $alert_code > 0 ) { + $notices[] = array( + 'type' => 'alert', + 'code' => (int) get_option( 'akismet_alert_code' ), + 'msg' => get_option( 'akismet_alert_msg' ), + ); } /* @@ -1117,7 +1141,6 @@ class Akismet_Admin { */ // $notices[] = array( 'type' => 'active-notice', 'time_saved' => 'Cleaning up spam takes time. Akismet has saved you 1 minute!' ); // $notices[] = array( 'type' => 'plugin' ); - // $notices[] = array( 'type' => 'spam-check', 'link_text' => 'Link text.' ); // $notices[] = array( 'type' => 'notice', 'notice_header' => 'This is the notice header.', 'notice_text' => 'This is the notice text.' ); // $notices[] = array( 'type' => 'missing-functions' ); // $notices[] = array( 'type' => 'servers-be-down' ); @@ -1131,6 +1154,7 @@ class Akismet_Admin { // $notices[] = array( 'type' => 'existing-key-invalid' ); // $notices[] = array( 'type' => 'new-key-failed' ); // $notices[] = array( 'type' => 'usage-limit', 'api_calls' => '15000', 'usage_limit' => '10000', 'upgrade_plan' => 'Enterprise', 'upgrade_url' => 'https://akismet.com/account/', 'code' => 10502 ); + // $notices[] = array( 'type' => 'spam-check', 'link_text' => 'Link text.' ); // $notices[] = array( 'type' => 'spam-check-cron-disabled' ); // $notices[] = array( 'type' => 'alert', 'code' => 123 ); @@ -1146,6 +1170,11 @@ class Akismet_Admin { return; } + // To see notice variants while testing. + // Akismet::view( 'notice', array( 'type' => 'spam-check-cron-disabled' ) ); + // Akismet::view( 'notice', array( 'type' => 'spam-check' ) ); + // Akismet::view( 'notice', array( 'type' => 'alert', 'code' => 123, 'msg' => 'Message' ) ); + if ( in_array( $hook_suffix, array( 'edit-comments.php' ) ) && (int) get_option( 'akismet_alert_code' ) > 0 ) { Akismet::verify_key( Akismet::get_api_key() ); //verify that the key is still in alert state diff --git a/wp-content/plugins/akismet/class.akismet.php b/wp-content/plugins/akismet/class.akismet.php index 7a89f61..0367d21 100644 --- a/wp-content/plugins/akismet/class.akismet.php +++ b/wp-content/plugins/akismet/class.akismet.php @@ -53,7 +53,7 @@ class Akismet { add_action( 'transition_comment_status', array( 'Akismet', 'transition_comment_status' ), 10, 3 ); // Run this early in the pingback call, before doing a remote fetch of the source uri - add_action( 'xmlrpc_call', array( 'Akismet', 'pre_check_pingback' ) ); + add_action( 'xmlrpc_call', array( 'Akismet', 'pre_check_pingback' ), 10, 3 ); // Jetpack compatibility add_filter( 'jetpack_options_whitelist', array( 'Akismet', 'add_to_jetpack_options_whitelist' ) ); @@ -224,6 +224,21 @@ class Akismet { self::$last_comment_result = null; + // Skip the Akismet check if the comment matches the Disallowed Keys list. + if ( function_exists( 'wp_check_comment_disallowed_list' ) ) { + $comment_author = isset( $commentdata['comment_author'] ) ? $commentdata['comment_author'] : ''; + $comment_author_email = isset( $commentdata['comment_author_email'] ) ? $commentdata['comment_author_email'] : ''; + $comment_author_url = isset( $commentdata['comment_author_url'] ) ? $commentdata['comment_author_url'] : ''; + $comment_content = isset( $commentdata['comment_content'] ) ? $commentdata['comment_content'] : ''; + $comment_author_ip = isset( $commentdata['comment_author_IP'] ) ? $commentdata['comment_author_IP'] : ''; + $comment_agent = isset( $commentdata['comment_agent'] ) ? $commentdata['comment_agent'] : ''; + + if ( wp_check_comment_disallowed_list( $comment_author, $comment_author_email, $comment_author_url, $comment_content, $comment_author_ip, $comment_agent ) ) { + self::set_last_comment( $commentdata ); + return $commentdata; + } + } + $comment = $commentdata; $comment['user_ip'] = self::get_ip_address(); @@ -427,7 +442,7 @@ class Akismet { load_plugin_textdomain( 'akismet' ); // normal result: true or false - if ( self::$last_comment['akismet_result'] == 'true' ) { + if ( isset( self::$last_comment['akismet_result'] ) && self::$last_comment['akismet_result'] == 'true' ) { update_comment_meta( $comment->comment_ID, 'akismet_result', 'true' ); self::update_comment_history( $comment->comment_ID, '', 'check-spam' ); if ( $comment->comment_approved != 'spam' ) { @@ -437,7 +452,7 @@ class Akismet { 'status-changed-' . $comment->comment_approved ); } - } elseif ( self::$last_comment['akismet_result'] == 'false' ) { + } elseif ( isset( self::$last_comment['akismet_result'] ) && self::$last_comment['akismet_result'] == 'false' ) { update_comment_meta( $comment->comment_ID, 'akismet_result', 'false' ); self::update_comment_history( $comment->comment_ID, '', 'check-ham' ); // Status could be spam or trash, depending on the WP version and whether this change applies: @@ -449,12 +464,26 @@ class Akismet { } else { self::update_comment_history( $comment->comment_ID, '', 'status-changed-' . $comment->comment_approved ); } - } else if ( function_exists( 'wp_blacklist_check' ) && wp_blacklist_check( $comment->comment_author, $comment->comment_author_email, $comment->comment_author_url, $comment->comment_content, $comment->comment_author_IP, $comment->comment_agent ) ) { - self::update_comment_history( $comment->comment_ID, '', 'wp-blacklisted' ); } else { self::update_comment_history( $comment->comment_ID, '', 'status-changed-' . $comment->comment_approved ); } } + } elseif ( ! isset( self::$last_comment['akismet_result'] ) ) { + // akismet_result isn't set, so the comment wasn't sent to Akismet. + update_comment_meta( $comment->comment_ID, 'akismet_skipped', 'true' ); + $caught_by_disallowed_list = false; + + if ( function_exists( 'wp_check_comment_disallowed_list' ) ) { + $caught_by_disallowed_list = wp_check_comment_disallowed_list( $comment->comment_author, $comment->comment_author_email, $comment->comment_author_url, $comment->comment_content, $comment->comment_author_IP, $comment->comment_agent ); + } + + if ( $caught_by_disallowed_list ) { + self::update_comment_history( $comment->comment_ID, '', 'wp-disallowed' ); + self::update_comment_history( $comment->comment_ID, '', 'akismet-skipped-disallowed' ); + } else { + // Add a generic skipped history item. + self::update_comment_history( $comment->comment_ID, '', 'akismet-skipped' ); + } } else { // abnormal result: error update_comment_meta( $comment->comment_ID, 'akismet_error', time() ); @@ -887,13 +916,16 @@ class Akismet { $comment_id = (int) $comment_id; - $comment = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM {$wpdb->comments} WHERE comment_ID = %d", $comment_id ) ); + $comment = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM {$wpdb->comments} WHERE comment_ID = %d", $comment_id ), ARRAY_A ); - if ( !$comment ) // it was deleted + if ( ! $comment ) { + // it was deleted return; + } - if ( 'spam' != $comment->comment_approved ) + if ( 'spam' != $comment['comment_approved'] ) { return; + } self::update_comment_history( $comment_id, '', 'report-spam' ); @@ -905,32 +937,36 @@ class Akismet { // use the original version stored in comment_meta if available $as_submitted = self::sanitize_comment_as_submitted( get_comment_meta( $comment_id, 'akismet_as_submitted', true ) ); - if ( $as_submitted && is_array( $as_submitted ) && isset( $as_submitted['comment_content'] ) ) - $comment = (object) array_merge( (array)$comment, $as_submitted ); + if ( $as_submitted && is_array( $as_submitted ) && isset( $as_submitted['comment_content'] ) ) { + $comment = array_merge( $comment, $as_submitted ); + } - $comment->blog = get_option( 'home' ); - $comment->blog_lang = get_locale(); - $comment->blog_charset = get_option('blog_charset'); - $comment->permalink = get_permalink($comment->comment_post_ID); + $comment['blog'] = get_option( 'home' ); + $comment['blog_lang'] = get_locale(); + $comment['blog_charset'] = get_option( 'blog_charset' ); + $comment['permalink'] = get_permalink( $comment['comment_post_ID'] ); - if ( is_object($current_user) ) - $comment->reporter = $current_user->user_login; + if ( is_object( $current_user ) ) { + $comment['reporter'] = $current_user->user_login; + } - if ( is_object($current_site) ) - $comment->site_domain = $current_site->domain; + if ( is_object( $current_site ) ) { + $comment['site_domain'] = $current_site->domain; + } - $comment->user_role = ''; - if ( ! empty( $comment->user_ID ) ) { - $comment->user_role = Akismet::get_user_roles( $comment->user_ID ); + $comment['user_role'] = ''; + if ( ! empty( $comment['user_ID'] ) ) { + $comment['user_role'] = self::get_user_roles( $comment['user_ID'] ); } - if ( self::is_test_mode() ) - $comment->is_test = 'true'; + if ( self::is_test_mode() ) { + $comment['is_test'] = 'true'; + } - $post = get_post( $comment->comment_post_ID ); + $post = get_post( $comment['comment_post_ID'] ); if ( ! is_null( $post ) ) { - $comment->comment_post_modified_gmt = $post->post_modified_gmt; + $comment['comment_post_modified_gmt'] = $post->post_modified_gmt; } $comment = apply_filters( 'akismet_request_args', $comment, 'submit-spam' ); @@ -939,8 +975,8 @@ class Akismet { update_comment_meta( $comment_id, 'akismet_user_result', 'true' ); - if ( $comment->reporter ) { - update_comment_meta( $comment_id, 'akismet_user', $comment->reporter ); + if ( $comment['reporter'] ) { + update_comment_meta( $comment_id, 'akismet_user', $comment['reporter'] ); } do_action('akismet_submit_spam_comment', $comment_id, $response[1]); @@ -951,9 +987,12 @@ class Akismet { $comment_id = (int) $comment_id; - $comment = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM {$wpdb->comments} WHERE comment_ID = %d", $comment_id ) ); - if ( !$comment ) // it was deleted + $comment = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM {$wpdb->comments} WHERE comment_ID = %d", $comment_id ), ARRAY_A ); + + if ( ! $comment ) { + // it was deleted return; + } self::update_comment_history( $comment_id, '', 'report-ham' ); @@ -965,32 +1004,36 @@ class Akismet { // use the original version stored in comment_meta if available $as_submitted = self::sanitize_comment_as_submitted( get_comment_meta( $comment_id, 'akismet_as_submitted', true ) ); - if ( $as_submitted && is_array($as_submitted) && isset($as_submitted['comment_content']) ) - $comment = (object) array_merge( (array)$comment, $as_submitted ); + if ( $as_submitted && is_array( $as_submitted ) && isset( $as_submitted['comment_content'] ) ) { + $comment = array_merge( $comment, $as_submitted ); + } - $comment->blog = get_option( 'home' ); - $comment->blog_lang = get_locale(); - $comment->blog_charset = get_option('blog_charset'); - $comment->permalink = get_permalink( $comment->comment_post_ID ); - $comment->user_role = ''; + $comment['blog'] = get_option( 'home' ); + $comment['blog_lang'] = get_locale(); + $comment['blog_charset'] = get_option( 'blog_charset' ); + $comment['permalink'] = get_permalink( $comment['comment_post_ID'] ); + $comment['user_role'] = ''; - if ( is_object($current_user) ) - $comment->reporter = $current_user->user_login; + if ( is_object( $current_user ) ) { + $comment['reporter'] = $current_user->user_login; + } - if ( is_object($current_site) ) - $comment->site_domain = $current_site->domain; + if ( is_object( $current_site ) ) { + $comment['site_domain'] = $current_site->domain; + } - if ( ! empty( $comment->user_ID ) ) { - $comment->user_role = Akismet::get_user_roles( $comment->user_ID ); + if ( ! empty( $comment['user_ID'] ) ) { + $comment['user_role'] = self::get_user_roles( $comment['user_ID'] ); } - if ( Akismet::is_test_mode() ) - $comment->is_test = 'true'; + if ( self::is_test_mode() ) { + $comment['is_test'] = 'true'; + } - $post = get_post( $comment->comment_post_ID ); + $post = get_post( $comment['comment_post_ID'] ); if ( ! is_null( $post ) ) { - $comment->comment_post_modified_gmt = $post->post_modified_gmt; + $comment['comment_post_modified_gmt'] = $post->post_modified_gmt; } $comment = apply_filters( 'akismet_request_args', $comment, 'submit-ham' ); @@ -999,8 +1042,8 @@ class Akismet { update_comment_meta( $comment_id, 'akismet_user_result', 'false' ); - if ( $comment->reporter ) { - update_comment_meta( $comment_id, 'akismet_user', $comment->reporter ); + if ( $comment['reporter'] ) { + update_comment_meta( $comment_id, 'akismet_user', $comment['reporter'] ); } do_action('akismet_submit_nonspam_comment', $comment_id, $response[1]); @@ -1424,8 +1467,16 @@ class Akismet { } $simplified_response = array( $response['headers'], $response['body'] ); - - self::update_alert( $simplified_response ); + + $alert_code_check_paths = array( + 'verify-key', + 'comment-check', + 'get-stats', + ); + + if ( in_array( $path, $alert_code_check_paths ) ) { + self::update_alert( $simplified_response ); + } return $simplified_response; } @@ -1442,6 +1493,7 @@ class Akismet { 'upgrade-plan', 'upgrade-url', 'upgrade-type', + 'upgrade-via-support', ); foreach ( $alert_header_names as $alert_header_name ) { @@ -1679,126 +1731,60 @@ p { } } - public static function pre_check_pingback( $method ) { - $pingback_args = array(); - if ( $method !== 'pingback.ping' ) + /** + * Check pingbacks for spam before they're saved to the DB. + * + * @param string $method The XML-RPC method that was called. + * @param array $args This and the $server arg are marked as optional since plugins might still be + * calling do_action( 'xmlrpc_action', [...] ) without the arguments that were added in WP 5.7. + * @param wp_xmlrpc_server $server + */ + public static function pre_check_pingback( $method, $args = array(), $server = null ) { + if ( $method !== 'pingback.ping' ) { return; + } - // A lot of this code is tightly coupled with the IXR class because the xmlrpc_call action doesn't pass along any information besides the method name. - // This ticket should hopefully fix that: https://core.trac.wordpress.org/ticket/52524 - // Until that happens, when it's a system.multicall, pre_check_pingback will be called once for every internal pingback call. - // Keep track of how many times this function has been called so we know which call to reference in the XML. - static $call_count = 0; - - $call_count++; - - global $wp_xmlrpc_server; - - if ( !is_object( $wp_xmlrpc_server ) ) - return false; - - $is_multicall = false; - $multicall_count = 0; - - if ( 'system.multicall' === $wp_xmlrpc_server->message->methodName ) { - $is_multicall = true; - - if ( 0 === $call_count ) { - // Only pass along the number of entries in the multicall the first time we see it. - $multicall_count = is_countable( $wp_xmlrpc_server->message->params ) ? count( $wp_xmlrpc_server->message->params ) : 0; - } - - /* - * $wp_xmlrpc_server->message looks like this: - * - ( - [message] => - [messageType] => methodCall - [faultCode] => - [faultString] => - [methodName] => system.multicall - [params] => Array - ( - [0] => Array - ( - [methodName] => pingback.ping - [params] => Array - ( - [0] => http://www.example.net/?p=1 // Site that created the pingback. - [1] => https://www.example.com/?p=1 // Post being pingback'd on this site. - ) - ) - [1] => Array - ( - [methodName] => pingback.ping - [params] => Array - ( - [0] => http://www.example.net/?p=1 // Site that created the pingback. - [1] => https://www.example.com/?p=2 // Post being pingback'd on this site. - ) - ) - ) - ) - */ - - // Use the params from the nth pingback.ping call in the multicall. - $pingback_calls_found = 0; + /* + * $args looks like this: + * + * Array + * ( + * [0] => http://www.example.net/?p=1 // Site that created the pingback. + * [1] => https://www.example.com/?p=2 // Post being pingback'd on this site. + * ) + */ - foreach ( $wp_xmlrpc_server->message->params as $xmlrpc_action ) { - if ( 'pingback.ping' === $xmlrpc_action['methodName'] ) { - $pingback_calls_found++; - } + if ( ! is_null( $server ) && ! empty( $args[1] ) ) { + $is_multicall = false; + $multicall_count = 0; - if ( $call_count === $pingback_calls_found ) { - $pingback_args = $xmlrpc_action['params']; - break; - } + if ( 'system.multicall' === $server->message->methodName ) { + $is_multicall = true; + $multicall_count = is_countable( $server->message->params ) ? count( $server->message->params ) : 0; } - } else { - /* - * $wp_xmlrpc_server->message looks like this: - * - ( - [message] => - [messageType] => methodCall - [faultCode] => - [faultString] => - [methodName] => pingback.ping - [params] => Array - ( - [0] => http://www.example.net/?p=1 // Site that created the pingback. - [1] => https://www.example.com/?p=2 // Post being pingback'd on this site. - ) - ) - */ - $pingback_args = $wp_xmlrpc_server->message->params; - } - if ( ! empty( $pingback_args[1] ) ) { - $post_id = url_to_postid( $pingback_args[1] ); + $post_id = url_to_postid( $args[1] ); // If pingbacks aren't open on this post, we'll still check whether this request is part of a potential DDOS, // but indicate to the server that pingbacks are indeed closed so we don't include this request in the user's stats, // since the user has already done their part by disabling pingbacks. $pingbacks_closed = false; - + $post = get_post( $post_id ); - + if ( ! $post || ! pings_open( $post ) ) { $pingbacks_closed = true; } - // Note: If is_multicall is true and multicall_count=0, then we know this is at least the 2nd pingback we've processed in this multicall. - $comment = array( - 'comment_author_url' => $pingback_args[0], + 'comment_author_url' => $args[0], 'comment_post_ID' => $post_id, 'comment_author' => '', 'comment_author_email' => '', 'comment_content' => '', 'comment_type' => 'pingback', 'akismet_pre_check' => '1', - 'comment_pingback_target' => $pingback_args[1], + 'comment_pingback_target' => $args[1], 'pingbacks_closed' => $pingbacks_closed ? '1' : '0', 'is_multicall' => $is_multicall, 'multicall_count' => $multicall_count, @@ -1808,7 +1794,7 @@ p { if ( isset( $comment['akismet_result'] ) && 'true' == $comment['akismet_result'] ) { // Sad: tightly coupled with the IXR classes. Unfortunately the action provides no context and no way to return anything. - $wp_xmlrpc_server->error( new IXR_Error( 0, 'Invalid discovery target' ) ); + $server->error( new IXR_Error( 0, 'Invalid discovery target' ) ); // Also note that if this was part of a multicall, a spam result will prevent the subsequent calls from being executed. // This is probably fine, but it raises the bar for what should be acceptable as a false positive. diff --git a/wp-content/plugins/akismet/readme.txt b/wp-content/plugins/akismet/readme.txt index 37e57be..9b19fbb 100644 --- a/wp-content/plugins/akismet/readme.txt +++ b/wp-content/plugins/akismet/readme.txt @@ -1,9 +1,9 @@ === Akismet Anti-spam: Spam Protection === Contributors: matt, ryan, andy, mdawaffe, tellyworth, josephscott, lessbloat, eoigal, cfinke, automattic, jgs, procifer, stephdau, kbrownkd, bluefuton, akismetantispam -Tags: comments, spam, antispam, anti-spam, contact form, anti spam, comment moderation, comment spam, contact form spam, spam comments +Tags: comments, spam, antispam, anti-spam, contact form Requires at least: 5.8 Tested up to: 6.5.3 -Stable tag: 5.3.2 +Stable tag: 5.3.3 License: GPLv2 or later The best anti-spam protection to block spam comments and spam in a contact form. The most trusted antispam solution for WordPress and WooCommerce. @@ -32,6 +32,14 @@ Upload the Akismet plugin to your blog, activate it, and then enter your Akismet == Changelog == += 5.3.3 = +*Release Date - 10 July 2024* + +* Make setup step clearer for new users. +* Remove the stats section from the configuration page if the site has been revoked from the key. +* Skip the Akismet comment check when the comment matches something in the disallowed list. +* Prompt users on legacy plans to contact Akismet support for upgrades. + = 5.3.2 = *Release Date - 21 March 2024* diff --git a/wp-content/plugins/akismet/views/config.php b/wp-content/plugins/akismet/views/config.php index b9e4457..23ad5c7 100644 --- a/wp-content/plugins/akismet/views/config.php +++ b/wp-content/plugins/akismet/views/config.php @@ -20,55 +20,57 @@ $kses_allow_link_href = array( <?php } ?> <?php if ( ! empty( $notices ) ) { ?> <?php foreach ( $notices as $notice ) { ?> - <?php Akismet::view( 'notice', $notice ); ?> + <?php Akismet::view( 'notice', array_merge( $notice, array( 'parent_view' => $name ) ) ); ?> <?php } ?> <?php } ?> - <div class="akismet-card"> - <div class="akismet-section-header"> - <h2 class="akismet-section-header__label"> - <span><?php esc_html_e( 'Statistics', 'akismet' ); ?></span> - </h2> + <?php if ( isset( $stat_totals['all'] ) && isset( $stat_totals['6-months'] ) ) : ?> + <div class="akismet-card"> + <div class="akismet-section-header"> + <h2 class="akismet-section-header__label"> + <span><?php esc_html_e( 'Statistics', 'akismet' ); ?></span> + </h2> - <div class="akismet-section-header__actions"> - <a href="<?php echo esc_url( Akismet_Admin::get_page_url( 'stats' ) ); ?>"> - <?php esc_html_e( 'Detailed stats', 'akismet' ); ?> - </a> - </div> - </div> <!-- close akismet-section-header --> + <div class="akismet-section-header__actions"> + <a href="<?php echo esc_url( Akismet_Admin::get_page_url( 'stats' ) ); ?>"> + <?php esc_html_e( 'Detailed stats', 'akismet' ); ?> + </a> + </div> + </div> <!-- close akismet-section-header --> - <div class="akismet-new-snapshot"> - <?php /* name attribute on iframe is used as a cache-buster here to force Firefox to load the new style charts: https://bugzilla.mozilla.org/show_bug.cgi?id=356558 */ ?> - <div class="akismet-new-snapshot__chart"> - <iframe id="stats-iframe" allowtransparency="true" scrolling="no" frameborder="0" style="width: 100%; height: 220px; overflow: hidden;" src="<?php echo esc_url( sprintf( 'https://tools.akismet.com/1.0/snapshot.php?blog=%s&token=%s&height=200&locale=%s&is_redecorated=1', rawurlencode( get_option( 'home' ) ), rawurlencode( Akismet::get_access_token() ), get_locale() ) ); ?>" name="<?php echo esc_attr( 'snapshot-' . filemtime( __FILE__ ) ); ?>" title="<?php echo esc_attr__( 'Akismet stats' ); ?>"></iframe> - </div> - <ul class="akismet-new-snapshot__list"> - <li class="akismet-new-snapshot__item"> - <h3 class="akismet-new-snapshot__header"><?php esc_html_e( 'Past six months', 'akismet' ); ?></h3> - <span class="akismet-new-snapshot__number"><?php echo number_format( $stat_totals['6-months']->spam ); ?></span> - <span class="akismet-new-snapshot__text"><?php echo esc_html( _n( 'Spam blocked', 'Spam blocked', $stat_totals['6-months']->spam, 'akismet' ) ); ?></span> - </li> - <li class="akismet-new-snapshot__item"> - <h3 class="akismet-new-snapshot__header"><?php esc_html_e( 'All time', 'akismet' ); ?></h3> - <span class="akismet-new-snapshot__number"><?php echo number_format( $stat_totals['all']->spam ); ?></span> - <span class="akismet-new-snapshot__text"><?php echo esc_html( _n( 'Spam blocked', 'Spam blocked', $stat_totals['all']->spam, 'akismet' ) ); ?></span> - </li> - <li class="akismet-new-snapshot__item"> - <h3 class="akismet-new-snapshot__header"><?php esc_html_e( 'Accuracy', 'akismet' ); ?></h3> - <span class="akismet-new-snapshot__number"><?php echo floatval( $stat_totals['all']->accuracy ); ?>%</span> - <span class="akismet-new-snapshot__text"> - <?php - /* translators: %s: number of spam missed by Akismet */ - echo esc_html( sprintf( _n( '%s missed spam', '%s missed spam', $stat_totals['all']->missed_spam, 'akismet' ), number_format( $stat_totals['all']->missed_spam ) ) ) . ', '; - /* translators: %s: number of false positive spam flagged by Akismet */ - echo esc_html( sprintf( _n( '%s false positive', '%s false positives', $stat_totals['all']->false_positives, 'akismet' ), number_format( $stat_totals['all']->false_positives ) ) ); - ?> - </span> - </li> - </ul> - </div> <!-- close akismet-new-snapshot --> + <div class="akismet-new-snapshot"> + <?php /* name attribute on iframe is used as a cache-buster here to force Firefox to load the new style charts: https://bugzilla.mozilla.org/show_bug.cgi?id=356558 */ ?> + <div class="akismet-new-snapshot__chart"> + <iframe id="stats-iframe" allowtransparency="true" scrolling="no" frameborder="0" style="width: 100%; height: 220px; overflow: hidden;" src="<?php echo esc_url( sprintf( 'https://tools.akismet.com/1.0/snapshot.php?blog=%s&token=%s&height=200&locale=%s&is_redecorated=1', rawurlencode( get_option( 'home' ) ), rawurlencode( Akismet::get_access_token() ), get_locale() ) ); ?>" name="<?php echo esc_attr( 'snapshot-' . filemtime( __FILE__ ) ); ?>" title="<?php echo esc_attr__( 'Akismet stats' ); ?>"></iframe> + </div> - </div> <!-- close akismet-card --> + <ul class="akismet-new-snapshot__list"> + <li class="akismet-new-snapshot__item"> + <h3 class="akismet-new-snapshot__header"><?php esc_html_e( 'Past six months', 'akismet' ); ?></h3> + <span class="akismet-new-snapshot__number"><?php echo number_format( $stat_totals['6-months']->spam ); ?></span> + <span class="akismet-new-snapshot__text"><?php echo esc_html( _n( 'Spam blocked', 'Spam blocked', $stat_totals['6-months']->spam, 'akismet' ) ); ?></span> + </li> + <li class="akismet-new-snapshot__item"> + <h3 class="akismet-new-snapshot__header"><?php esc_html_e( 'All time', 'akismet' ); ?></h3> + <span class="akismet-new-snapshot__number"><?php echo number_format( $stat_totals['all']->spam ); ?></span> + <span class="akismet-new-snapshot__text"><?php echo esc_html( _n( 'Spam blocked', 'Spam blocked', $stat_totals['all']->spam, 'akismet' ) ); ?></span> + </li> + <li class="akismet-new-snapshot__item"> + <h3 class="akismet-new-snapshot__header"><?php esc_html_e( 'Accuracy', 'akismet' ); ?></h3> + <span class="akismet-new-snapshot__number"><?php echo floatval( $stat_totals['all']->accuracy ); ?>%</span> + <span class="akismet-new-snapshot__text"> + <?php + /* translators: %s: number of spam missed by Akismet */ + echo esc_html( sprintf( _n( '%s missed spam', '%s missed spam', $stat_totals['all']->missed_spam, 'akismet' ), number_format( $stat_totals['all']->missed_spam ) ) ) . ', '; + /* translators: %s: number of false positive spam flagged by Akismet */ + echo esc_html( sprintf( _n( '%s false positive', '%s false positives', $stat_totals['all']->false_positives, 'akismet' ), number_format( $stat_totals['all']->false_positives ) ) ); + ?> + </span> + </li> + </ul> + </div> <!-- close akismet-new-snapshot --> + </div> <!-- close akismet-card --> + <?php endif; ?> <?php if ( $akismet_user ) : ?> <div class="akismet-card"> diff --git a/wp-content/plugins/akismet/views/notice.php b/wp-content/plugins/akismet/views/notice.php index 466a322..be10ab2 100644 --- a/wp-content/plugins/akismet/views/notice.php +++ b/wp-content/plugins/akismet/views/notice.php @@ -9,9 +9,12 @@ $kses_allow_link = array( ); $kses_allow_strong = array( 'strong' => true ); +if ( ! isset( $type ) ) { + $type = false; // phpcs:ignore WordPress.WP.GlobalVariablesOverride.Prohibited +} + /* - * Some notices (plugin, spam-check, spam-check-cron-disabled, alert and usage-limit) are shown elsewhere in wp-admin, - * so look different to the standard notices. + * Some notices (plugin, spam-check, spam-check-cron-disabled, alert and usage-limit) are also shown elsewhere in wp-admin, so have different classes applied so that they match the standard WordPress notice format. */ ?> <?php if ( $type === 'plugin' ) : ?> @@ -37,25 +40,27 @@ $kses_allow_strong = array( 'strong' => true ); </div> <?php elseif ( $type === 'spam-check' ) : ?> -<div class="notice notice-warning"> - <p><strong><?php esc_html_e( 'Akismet has detected a problem.', 'akismet' ); ?></strong></p> - <p><?php esc_html_e( 'Some comments have not yet been checked for spam by Akismet. They have been temporarily held for moderation and will automatically be rechecked later.', 'akismet' ); ?></p> - <?php if ( $link_text ) : ?> - <p><?php echo wp_kses( $link_text, $kses_allow_link ); ?></p> - <?php endif; ?> -</div> + <?php // This notice is only displayed on edit-comments.php. ?> + <div class="notice notice-warning"> + <p><strong><?php esc_html_e( 'Akismet has detected a problem.', 'akismet' ); ?></strong></p> + <p><?php esc_html_e( 'Some comments have not yet been checked for spam by Akismet. They have been temporarily held for moderation and will automatically be rechecked later.', 'akismet' ); ?></p> + <?php if ( ! empty( $link_text ) ) : ?> + <p><?php echo wp_kses( $link_text, $kses_allow_link ); ?></p> + <?php endif; ?> + </div> <?php elseif ( $type === 'spam-check-cron-disabled' ) : ?> -<div class="notice notice-warning"> - <p><strong><?php esc_html_e( 'Akismet has detected a problem.', 'akismet' ); ?></strong></p> - <p><?php esc_html_e( 'WP-Cron has been disabled using the DISABLE_WP_CRON constant. Comment rechecks may not work properly.', 'akismet' ); ?></p> -</div> - + <?php // This notice is only displayed on edit-comments.php. ?> + <div class="notice notice-warning"> + <p><strong><?php esc_html_e( 'Akismet has detected a problem.', 'akismet' ); ?></strong></p> + <p><?php esc_html_e( 'WP-Cron has been disabled using the DISABLE_WP_CRON constant. Comment rechecks may not work properly.', 'akismet' ); ?></p> + </div> + <?php elseif ( $type === 'alert' ) : ?> -<div class="error"> +<div class="<?php echo isset( $parent_view ) && $parent_view === 'config' ? 'akismet-alert is-bad' : 'error'; ?>"> <?php /* translators: The placeholder is an error code returned by Akismet. */ ?> <p><strong><?php printf( esc_html__( 'Akismet error code: %s', 'akismet' ), esc_html( $code ) ); ?></strong></p> - <p><?php echo esc_html( $msg ); ?></p> + <p><?php echo isset( $msg ) ? esc_html( $msg ) : ''; ?></p> <p> <?php /* translators: the placeholder is a clickable URL that leads to more information regarding an error code. */ @@ -307,8 +312,11 @@ $kses_allow_strong = array( 'strong' => true ); <div class="akismet-usage-limit-cta"> <a href="<?php echo esc_attr( $upgrade_url ); ?>" class="button" target="_blank"> <?php - // If only a qty upgrade is required, show a more generic message. - if ( ! empty( $upgrade_type ) && 'qty' === $upgrade_type ) { + if ( isset( $upgrade_via_support ) && $upgrade_via_support ) { + // Direct user to contact support. + esc_html_e( 'Contact Akismet support', 'akismet' ); + } elseif ( ! empty( $upgrade_type ) && 'qty' === $upgrade_type ) { + // If only a qty upgrade is required, show a more generic message. esc_html_e( 'Upgrade your subscription level', 'akismet' ); } else { echo esc_html( diff --git a/wp-content/plugins/akismet/views/setup.php b/wp-content/plugins/akismet/views/setup.php index 5078009..f4ddaf1 100644 --- a/wp-content/plugins/akismet/views/setup.php +++ b/wp-content/plugins/akismet/views/setup.php @@ -1,4 +1,4 @@ <div class="akismet-setup-instructions"> <p><?php esc_html_e( 'Set up your Akismet account to enable spam filtering on this site.', 'akismet' ); ?></p> - <?php Akismet::view( 'get', array( 'text' => __( 'Set up your Akismet account' , 'akismet' ), 'classes' => array( 'akismet-button', 'akismet-is-primary' ) ) ); ?> + <?php Akismet::view( 'get', array( 'text' => __( 'Choose an Akismet plan', 'akismet' ), 'classes' => array( 'akismet-button', 'akismet-is-primary' ) ) ); ?> </div> diff --git a/wp-content/themes/twentytwentyfour/patterns/banner-hero.php b/wp-content/themes/twentytwentyfour/patterns/banner-hero.php index 4587ac8..9971884 100644 --- a/wp-content/themes/twentytwentyfour/patterns/banner-hero.php +++ b/wp-content/themes/twentytwentyfour/patterns/banner-hero.php @@ -4,6 +4,7 @@ * Slug: twentytwentyfour/banner-hero * Categories: banner, call-to-action, featured * Viewport width: 1400 + * Description: A hero section with a title, a paragraph, a CTA button, and an image. */ ?> diff --git a/wp-content/themes/twentytwentyfour/patterns/banner-project-description.php b/wp-content/themes/twentytwentyfour/patterns/banner-project-description.php index 31a44fc..7ddeea7 100644 --- a/wp-content/themes/twentytwentyfour/patterns/banner-project-description.php +++ b/wp-content/themes/twentytwentyfour/patterns/banner-project-description.php @@ -4,6 +4,7 @@ * Slug: twentytwentyfour/banner-project-description * Categories: featured, banner, about, portfolio * Viewport width: 1400 + * Description: Project description section with title, paragraph, and an image. */ ?> <!-- wp:group {"align":"full","style":{"spacing":{"margin":{"top":"0","bottom":"0"},"padding":{"top":"var:preset|spacing|50","bottom":"var:preset|spacing|50","left":"var:preset|spacing|50","right":"var:preset|spacing|50"}}},"backgroundColor":"accent-2","layout":{"type":"constrained"}} --> diff --git a/wp-content/themes/twentytwentyfour/patterns/cta-content-image-on-right.php b/wp-content/themes/twentytwentyfour/patterns/cta-content-image-on-right.php index f46ecbc..49bceb2 100644 --- a/wp-content/themes/twentytwentyfour/patterns/cta-content-image-on-right.php +++ b/wp-content/themes/twentytwentyfour/patterns/cta-content-image-on-right.php @@ -4,6 +4,7 @@ * Slug: twentytwentyfour/cta-content-image-on-right * Categories: call-to-action, banner * Viewport width: 1400 + * Description: A title, paragraph, two CTA buttons, and an image for a general CTA section. */ ?> diff --git a/wp-content/themes/twentytwentyfour/patterns/cta-pricing.php b/wp-content/themes/twentytwentyfour/patterns/cta-pricing.php index 45f85f5..4ba3937 100644 --- a/wp-content/themes/twentytwentyfour/patterns/cta-pricing.php +++ b/wp-content/themes/twentytwentyfour/patterns/cta-pricing.php @@ -4,6 +4,7 @@ * Slug: twentytwentyfour/cta-pricing * Categories: call-to-action, services * Viewport width: 1400 + * Description: A pricing section with a title, a paragraph and three pricing levels. */ ?> diff --git a/wp-content/themes/twentytwentyfour/patterns/cta-rsvp.php b/wp-content/themes/twentytwentyfour/patterns/cta-rsvp.php index 9981065..a123869 100644 --- a/wp-content/themes/twentytwentyfour/patterns/cta-rsvp.php +++ b/wp-content/themes/twentytwentyfour/patterns/cta-rsvp.php @@ -4,6 +4,7 @@ * Slug: twentytwentyfour/cta-rsvp * Categories: call-to-action, featured * Viewport width: 1100 + * Description: A large RSVP heading sideways, a description, and a CTA button. */ ?> diff --git a/wp-content/themes/twentytwentyfour/patterns/cta-services-image-left.php b/wp-content/themes/twentytwentyfour/patterns/cta-services-image-left.php index 87f3c9f..b6315b0 100644 --- a/wp-content/themes/twentytwentyfour/patterns/cta-services-image-left.php +++ b/wp-content/themes/twentytwentyfour/patterns/cta-services-image-left.php @@ -4,6 +4,7 @@ * Slug: twentytwentyfour/cta-services-image-left * Categories: call-to-action, banner, featured, services * Viewport width: 1400 + * Description: An image, title, paragraph and a CTA button to describe services. */ ?> diff --git a/wp-content/themes/twentytwentyfour/patterns/cta-subscribe-centered.php b/wp-content/themes/twentytwentyfour/patterns/cta-subscribe-centered.php index b65eac5..c11b913 100644 --- a/wp-content/themes/twentytwentyfour/patterns/cta-subscribe-centered.php +++ b/wp-content/themes/twentytwentyfour/patterns/cta-subscribe-centered.php @@ -4,6 +4,7 @@ * Slug: twentytwentyfour/cta-subscribe-centered * Categories: call-to-action * Keywords: newsletter, subscribe, button + * Description: Subscribers CTA section with a title, a paragraph and a CTA button. */ ?> diff --git a/wp-content/themes/twentytwentyfour/patterns/footer-centered-logo-nav.php b/wp-content/themes/twentytwentyfour/patterns/footer-centered-logo-nav.php index 4370eac..3925876 100644 --- a/wp-content/themes/twentytwentyfour/patterns/footer-centered-logo-nav.php +++ b/wp-content/themes/twentytwentyfour/patterns/footer-centered-logo-nav.php @@ -4,6 +4,7 @@ * Slug: twentytwentyfour/footer-centered-logo-nav * Categories: footer * Block Types: core/template-part/footer + * Description: A footer section with a centered logo, navigation, and WordPress credits. */ ?> diff --git a/wp-content/themes/twentytwentyfour/patterns/footer-colophon-3-col.php b/wp-content/themes/twentytwentyfour/patterns/footer-colophon-3-col.php index cfb15db..e0de63b 100644 --- a/wp-content/themes/twentytwentyfour/patterns/footer-colophon-3-col.php +++ b/wp-content/themes/twentytwentyfour/patterns/footer-colophon-3-col.php @@ -4,6 +4,7 @@ * Slug: twentytwentyfour/footer-colophon-3-col * Categories: footer * Block Types: core/template-part/footer + * Description: A footer section with a colophon and 3 columns. */ ?> diff --git a/wp-content/themes/twentytwentyfour/patterns/footer.php b/wp-content/themes/twentytwentyfour/patterns/footer.php index 85f310d..4b8aeb2 100644 --- a/wp-content/themes/twentytwentyfour/patterns/footer.php +++ b/wp-content/themes/twentytwentyfour/patterns/footer.php @@ -4,6 +4,7 @@ * Slug: twentytwentyfour/footer * Categories: footer * Block Types: core/template-part/footer + * Description: A footer section with a colophon and 4 columns. */ ?> diff --git a/wp-content/themes/twentytwentyfour/patterns/gallery-full-screen-image.php b/wp-content/themes/twentytwentyfour/patterns/gallery-full-screen-image.php index ee26fca..dc9cc5d 100644 --- a/wp-content/themes/twentytwentyfour/patterns/gallery-full-screen-image.php +++ b/wp-content/themes/twentytwentyfour/patterns/gallery-full-screen-image.php @@ -3,6 +3,7 @@ * Title: Full screen image * Slug: twentytwentyfour/gallery-full-screen-image * Categories: gallery, portfolio + * Description: A cover image section that covers the entire width. */ ?> diff --git a/wp-content/themes/twentytwentyfour/patterns/gallery-offset-images-grid-2-col.php b/wp-content/themes/twentytwentyfour/patterns/gallery-offset-images-grid-2-col.php index 67ea044..8e2222e 100644 --- a/wp-content/themes/twentytwentyfour/patterns/gallery-offset-images-grid-2-col.php +++ b/wp-content/themes/twentytwentyfour/patterns/gallery-offset-images-grid-2-col.php @@ -5,6 +5,7 @@ * Categories: gallery, portfolio * Keywords: project, images, media, masonry, columns * Viewport width: 1400 + * Description: A gallery section with 2 columns and offset images. */ ?> <!-- wp:group {"metadata":{"name":"Portfolio Images"},"align":"full","style":{"spacing":{"padding":{"right":"var:preset|spacing|50","left":"var:preset|spacing|50","top":"var:preset|spacing|50","bottom":"var:preset|spacing|50"},"margin":{"top":"0","bottom":"0"}}},"layout":{"type":"constrained"}} --> diff --git a/wp-content/themes/twentytwentyfour/patterns/gallery-offset-images-grid-3-col.php b/wp-content/themes/twentytwentyfour/patterns/gallery-offset-images-grid-3-col.php index 3280317..5f32f7f 100644 --- a/wp-content/themes/twentytwentyfour/patterns/gallery-offset-images-grid-3-col.php +++ b/wp-content/themes/twentytwentyfour/patterns/gallery-offset-images-grid-3-col.php @@ -5,6 +5,7 @@ * Categories: gallery, portfolio * Keywords: project, images, media, masonry, columns * Viewport width: 1400 + * Description: A gallery section with 3 columns and offset images. */ ?> <!-- wp:group {"metadata":{"name":"Portfolio Images"},"align":"full","style":{"spacing":{"padding":{"right":"var:preset|spacing|50","left":"var:preset|spacing|50","top":"var:preset|spacing|50","bottom":"var:preset|spacing|50"},"margin":{"top":"0","bottom":"0"}}},"layout":{"type":"constrained"}} --> diff --git a/wp-content/themes/twentytwentyfour/patterns/gallery-offset-images-grid-4-col.php b/wp-content/themes/twentytwentyfour/patterns/gallery-offset-images-grid-4-col.php index 8c89db8..df9341d 100644 --- a/wp-content/themes/twentytwentyfour/patterns/gallery-offset-images-grid-4-col.php +++ b/wp-content/themes/twentytwentyfour/patterns/gallery-offset-images-grid-4-col.php @@ -5,6 +5,7 @@ * Categories: gallery, featured, portfolio * Keywords: project, images, media, masonry, columns * Viewport width: 1400 + * Description: A gallery section with 4 columns and offset images. */ ?> diff --git a/wp-content/themes/twentytwentyfour/patterns/gallery-project-layout.php b/wp-content/themes/twentytwentyfour/patterns/gallery-project-layout.php index 27d6f74..143d61b 100644 --- a/wp-content/themes/twentytwentyfour/patterns/gallery-project-layout.php +++ b/wp-content/themes/twentytwentyfour/patterns/gallery-project-layout.php @@ -4,6 +4,7 @@ * Slug: twentytwentyfour/gallery-project-layout * Categories: gallery, featured, portfolio * Viewport width: 1600 + * Description: A gallery section with a project layout with 2 images. */ ?> diff --git a/wp-content/themes/twentytwentyfour/patterns/page-about-business.php b/wp-content/themes/twentytwentyfour/patterns/page-about-business.php index ad62698..7b662c2 100644 --- a/wp-content/themes/twentytwentyfour/patterns/page-about-business.php +++ b/wp-content/themes/twentytwentyfour/patterns/page-about-business.php @@ -7,6 +7,7 @@ * Block Types: core/post-content * Post Types: page, wp_template * Viewport width: 1400 + * Description: A business about page with a hero section, a text section, a services section, a team section, a clients section, a FAQ section, and a CTA section. */ ?> diff --git a/wp-content/themes/twentytwentyfour/patterns/page-home-blogging.php b/wp-content/themes/twentytwentyfour/patterns/page-home-blogging.php index 5cef5d4..bd08b6e 100644 --- a/wp-content/themes/twentytwentyfour/patterns/page-home-blogging.php +++ b/wp-content/themes/twentytwentyfour/patterns/page-home-blogging.php @@ -6,6 +6,7 @@ * Keywords: page, starter * Post Types: page, wp_template * Viewport width: 1400 + * Description: A blogging home page with a hero section, a text section, a blog section, and a CTA section. */ ?> diff --git a/wp-content/themes/twentytwentyfour/patterns/page-home-business.php b/wp-content/themes/twentytwentyfour/patterns/page-home-business.php index 415c42f..3f2c748 100644 --- a/wp-content/themes/twentytwentyfour/patterns/page-home-business.php +++ b/wp-content/themes/twentytwentyfour/patterns/page-home-business.php @@ -7,6 +7,7 @@ * Block Types: core/post-content * Post Types: page, wp_template * Viewport width: 1400 + * Description: A business home page with a hero section, a text section, a services section, a team section, a clients section, a FAQ section, and a CTA section. */ ?> diff --git a/wp-content/themes/twentytwentyfour/patterns/page-home-portfolio-gallery.php b/wp-content/themes/twentytwentyfour/patterns/page-home-portfolio-gallery.php index a9ce9d7..511a3b8 100644 --- a/wp-content/themes/twentytwentyfour/patterns/page-home-portfolio-gallery.php +++ b/wp-content/themes/twentytwentyfour/patterns/page-home-portfolio-gallery.php @@ -7,6 +7,7 @@ * Block Types: core/post-content * Post Types: page, wp_template * Viewport width: 1400 + * Description: A porfolio home page that features a gallery. */ ?> diff --git a/wp-content/themes/twentytwentyfour/patterns/page-home-portfolio.php b/wp-content/themes/twentytwentyfour/patterns/page-home-portfolio.php index 40d4fa1..c03d1b1 100644 --- a/wp-content/themes/twentytwentyfour/patterns/page-home-portfolio.php +++ b/wp-content/themes/twentytwentyfour/patterns/page-home-portfolio.php @@ -7,6 +7,7 @@ * Block Types: core/post-content * Post Types: page, wp_template * Viewport width: 1400 + * Description: A portfolio home page with a description and a 4-column post section with only feature images. */ ?> diff --git a/wp-content/themes/twentytwentyfour/patterns/page-newsletter-landing.php b/wp-content/themes/twentytwentyfour/patterns/page-newsletter-landing.php index 5ee552e..6ad69ff 100644 --- a/wp-content/themes/twentytwentyfour/patterns/page-newsletter-landing.php +++ b/wp-content/themes/twentytwentyfour/patterns/page-newsletter-landing.php @@ -7,6 +7,7 @@ * Block Types: core/post-content * Post Types: page, wp_template * Viewport width: 1100 + * Description: A block with a newsletter subscription CTA for a landing page. */ ?> diff --git a/wp-content/themes/twentytwentyfour/patterns/page-portfolio-overview.php b/wp-content/themes/twentytwentyfour/patterns/page-portfolio-overview.php index b0bf21b..6aee66b 100644 --- a/wp-content/themes/twentytwentyfour/patterns/page-portfolio-overview.php +++ b/wp-content/themes/twentytwentyfour/patterns/page-portfolio-overview.php @@ -7,6 +7,7 @@ * Block Types: core/post-content * Post Types: page, wp_template * Viewport width: 1400 + * Description: A full portfolio page with a section for project description, project details, a full screen image, and a gallery section with two images. */ ?> diff --git a/wp-content/themes/twentytwentyfour/patterns/page-rsvp-landing.php b/wp-content/themes/twentytwentyfour/patterns/page-rsvp-landing.php index 8b3ba83..6ec6732 100644 --- a/wp-content/themes/twentytwentyfour/patterns/page-rsvp-landing.php +++ b/wp-content/themes/twentytwentyfour/patterns/page-rsvp-landing.php @@ -7,6 +7,7 @@ * Block Types: core/post-content * Post Types: page, wp_template * Viewport width: 1100 + * Description: A large RSVP heading sideways, a description, and a CTA button. */ ?> diff --git a/wp-content/themes/twentytwentyfour/patterns/posts-1-col.php b/wp-content/themes/twentytwentyfour/patterns/posts-1-col.php index 051ed14..f2bbaa1 100644 --- a/wp-content/themes/twentytwentyfour/patterns/posts-1-col.php +++ b/wp-content/themes/twentytwentyfour/patterns/posts-1-col.php @@ -4,6 +4,7 @@ * Slug: twentytwentyfour/posts-1-col * Categories: query * Block Types: core/query + * Description: A list of posts, 1 column. */ ?> diff --git a/wp-content/themes/twentytwentyfour/patterns/posts-3-col.php b/wp-content/themes/twentytwentyfour/patterns/posts-3-col.php index 62a48c4..8556154 100644 --- a/wp-content/themes/twentytwentyfour/patterns/posts-3-col.php +++ b/wp-content/themes/twentytwentyfour/patterns/posts-3-col.php @@ -4,6 +4,7 @@ * Slug: twentytwentyfour/posts-3-col * Categories: query * Block Types: core/query + * Description: A list of posts, 3 columns. */ ?> diff --git a/wp-content/themes/twentytwentyfour/patterns/posts-grid-2-col.php b/wp-content/themes/twentytwentyfour/patterns/posts-grid-2-col.php index dd2881d..d6a584f 100644 --- a/wp-content/themes/twentytwentyfour/patterns/posts-grid-2-col.php +++ b/wp-content/themes/twentytwentyfour/patterns/posts-grid-2-col.php @@ -4,6 +4,7 @@ * Slug: twentytwentyfour/posts-grid-2-col * Categories: query * Block Types: core/query + * Description: A grid of posts featuring the first post, 2 columns. */ ?> diff --git a/wp-content/themes/twentytwentyfour/patterns/posts-images-only-3-col.php b/wp-content/themes/twentytwentyfour/patterns/posts-images-only-3-col.php index 48bf4d0..7aee493 100644 --- a/wp-content/themes/twentytwentyfour/patterns/posts-images-only-3-col.php +++ b/wp-content/themes/twentytwentyfour/patterns/posts-images-only-3-col.php @@ -4,6 +4,7 @@ * Slug: twentytwentyfour/posts-images-only-3-col * Categories: query * Block Types: core/query + * Description: A list of posts with featured images only, 3 columns. */ ?> diff --git a/wp-content/themes/twentytwentyfour/patterns/posts-images-only-offset-4-col.php b/wp-content/themes/twentytwentyfour/patterns/posts-images-only-offset-4-col.php index 808754b..2cbcaff 100644 --- a/wp-content/themes/twentytwentyfour/patterns/posts-images-only-offset-4-col.php +++ b/wp-content/themes/twentytwentyfour/patterns/posts-images-only-offset-4-col.php @@ -3,6 +3,7 @@ * Title: Offset posts with featured images only, 4 columns * Slug: twentytwentyfour/posts-images-only-offset-4-col * Categories: posts + * Description: A list of posts with featured images only, 4 columns. */ ?> diff --git a/wp-content/themes/twentytwentyfour/patterns/posts-list.php b/wp-content/themes/twentytwentyfour/patterns/posts-list.php index 5db93af..e298a54 100644 --- a/wp-content/themes/twentytwentyfour/patterns/posts-list.php +++ b/wp-content/themes/twentytwentyfour/patterns/posts-list.php @@ -4,6 +4,7 @@ * Slug: twentytwentyfour/posts-list * Categories: query, posts * Block Types: core/query + * Description: A list of posts without images, 1 column. */ ?> diff --git a/wp-content/themes/twentytwentyfour/patterns/team-4-col.php b/wp-content/themes/twentytwentyfour/patterns/team-4-col.php index 78211d2..86a8bfa 100644 --- a/wp-content/themes/twentytwentyfour/patterns/team-4-col.php +++ b/wp-content/themes/twentytwentyfour/patterns/team-4-col.php @@ -4,6 +4,7 @@ * Slug: twentytwentyfour/team-4-col * Categories: team, about * Viewport width: 1400 + * Description: A team section, with a heading, a paragraph, and 4 columns for team members. */ ?> diff --git a/wp-content/themes/twentytwentyfour/patterns/testimonial-centered.php b/wp-content/themes/twentytwentyfour/patterns/testimonial-centered.php index 8e63924..7ca8275 100644 --- a/wp-content/themes/twentytwentyfour/patterns/testimonial-centered.php +++ b/wp-content/themes/twentytwentyfour/patterns/testimonial-centered.php @@ -5,10 +5,11 @@ * Keywords: quote, review, about * Categories: testimonials, text * Viewport width: 1300 + * Description: A centered testimonial section with a avatar, name, and job title. */ ?> -<!-- wp:group {"metadata":{"name":"<?php echo esc_html_x( 'Testimonial', 'Name of testimonal pattern', 'twentytwentyfour' ); ?>"},"align":"full","style":{"spacing":{"padding":{"top":"var:preset|spacing|60","bottom":"var:preset|spacing|60","left":"var:preset|spacing|60","right":"var:preset|spacing|60"},"margin":{"top":"0","bottom":"0"}}},"backgroundColor":"contrast","textColor":"base","layout":{"type":"constrained","contentSize":""}} --> +<!-- wp:group {"metadata":{"name":"<?php echo esc_html_x( 'Testimonial', 'Name of testimonial pattern', 'twentytwentyfour' ); ?>"},"align":"full","style":{"spacing":{"padding":{"top":"var:preset|spacing|60","bottom":"var:preset|spacing|60","left":"var:preset|spacing|60","right":"var:preset|spacing|60"},"margin":{"top":"0","bottom":"0"}}},"backgroundColor":"contrast","textColor":"base","layout":{"type":"constrained","contentSize":""}} --> <div class="wp-block-group alignfull has-base-color has-contrast-background-color has-text-color has-background" style="margin-top:0;margin-bottom:0;padding-top:var(--wp--preset--spacing--60);padding-right:var(--wp--preset--spacing--60);padding-bottom:var(--wp--preset--spacing--60);padding-left:var(--wp--preset--spacing--60)"> <!-- wp:group {"layout":{"type":"constrained"}} --> <div class="wp-block-group"> diff --git a/wp-content/themes/twentytwentyfour/patterns/text-alternating-images.php b/wp-content/themes/twentytwentyfour/patterns/text-alternating-images.php index 12a0772..105ac2a 100644 --- a/wp-content/themes/twentytwentyfour/patterns/text-alternating-images.php +++ b/wp-content/themes/twentytwentyfour/patterns/text-alternating-images.php @@ -4,6 +4,7 @@ * Slug: twentytwentyfour/text-alternating-images * Categories: text, about * Viewport width: 1400 + * Description: A text section, then a two column section with text in one and image in another. */ ?> diff --git a/wp-content/themes/twentytwentyfour/patterns/text-centered-statement-small.php b/wp-content/themes/twentytwentyfour/patterns/text-centered-statement-small.php index c24a51a..5408463 100644 --- a/wp-content/themes/twentytwentyfour/patterns/text-centered-statement-small.php +++ b/wp-content/themes/twentytwentyfour/patterns/text-centered-statement-small.php @@ -5,6 +5,7 @@ * Categories: text, about * Keywords: mission, introduction * Viewport width: 1200 + * Description: A centered itallic text statement with compact padding. */ ?> diff --git a/wp-content/themes/twentytwentyfour/patterns/text-centered-statement.php b/wp-content/themes/twentytwentyfour/patterns/text-centered-statement.php index ce7751e..f8fbb4d 100644 --- a/wp-content/themes/twentytwentyfour/patterns/text-centered-statement.php +++ b/wp-content/themes/twentytwentyfour/patterns/text-centered-statement.php @@ -5,6 +5,7 @@ * Categories: text, about, featured * Keywords: mission, introduction * Viewport width: 1400 + * Description: A centered text statement with a large paddings. */ ?> diff --git a/wp-content/themes/twentytwentyfour/patterns/text-faq.php b/wp-content/themes/twentytwentyfour/patterns/text-faq.php index 8bf0428..000aa61 100644 --- a/wp-content/themes/twentytwentyfour/patterns/text-faq.php +++ b/wp-content/themes/twentytwentyfour/patterns/text-faq.php @@ -5,6 +5,7 @@ * Categories: text, about, featured * Keywords: faq, about, frequently asked * Viewport width: 1400 + * Description: A FAQ section with a large FAQ heading and list of toggle questions and answers. */ ?> @@ -16,45 +17,48 @@ <!-- wp:group {"align":"wide","layout":{"type":"default"}} --> <div class="wp-block-group alignwide"> - <!-- wp:separator {"backgroundColor":"base","className":"is-style-wide"} --> - <hr class="wp-block-separator has-text-color has-base-color has-alpha-channel-opacity has-base-background-color has-background is-style-wide"/> + <!-- wp:separator {"style":{"spacing":{"margin":{"top":"var:preset|spacing|30","bottom":"var:preset|spacing|30"}}},"backgroundColor":"base","className":"is-style-wide"} --> + <hr class="wp-block-separator has-text-color has-base-color has-alpha-channel-opacity has-base-background-color has-background is-style-wide" style="margin-top:var(--wp--preset--spacing--30);margin-bottom:var(--wp--preset--spacing--30)"/> <!-- /wp:separator --> + <!-- wp:heading {"level":3,"align":"wide","style":{"elements":{"link":{"color":{"text":"var:preset|color|base-2"}}}},"textColor":"base-2"} --> + <h3 class="wp-block-heading alignwide has-base-2-color has-text-color has-link-color"><?php echo esc_html_x( 'What is your process working in smaller projects?', 'Question in the FAQ pattern', 'twentytwentyfour' ); ?></h3> + <!-- /wp:heading --> + <!-- wp:paragraph {"placeholder":"Type / to add a hidden block","style":{"elements":{"link":{"color":{"text":"var:preset|color|contrast-1"}}}},"textColor":"contrast-1"} --> + <p class="has-contrast-1-color has-text-color has-link-color"><?php echo esc_html_x( 'Études offers comprehensive consulting, management, design, and research solutions. Our vision is to be at the forefront of architectural innovation, fostering a global community of architects and enthusiasts united by a passion for creating spaces. Every architectural endeavor is an opportunity to shape the future.', 'Answer in the FAQ pattern', 'twentytwentyfour' ); ?></p> + <!-- /wp:paragraph --> - <!-- wp:details {"style":{"spacing":{"margin":{"top":"0"}},"border":{"top":{"width":"0px","style":"none"},"right":{"width":"0px","style":"none"},"bottom":{"color":"var:preset|color|base","style":"solid","width":"1px"},"left":{"width":"0px","style":"none"}}},"className":"is-style-arrow-icon-details","fontSize":"medium"} --> - <details class="wp-block-details is-style-arrow-icon-details has-medium-font-size" style="border-top-style:none;border-top-width:0px;border-right-style:none;border-right-width:0px;border-bottom-color:var(--wp--preset--color--base);border-bottom-style:solid;border-bottom-width:1px;border-left-style:none;border-left-width:0px;margin-top:0"> - <summary><?php echo esc_html_x( 'What is your process working in smaller projects?', 'Question on the details block', 'twentytwentyfour' ); ?></summary> - <!-- wp:paragraph {"placeholder":"Type / to add a hidden block","style":{"elements":{"link":{"color":{"text":"var:preset|color|contrast-1"}}}},"textColor":"contrast-1"} --> - <p class="has-contrast-1-color has-text-color has-link-color"><?php echo esc_html_x( 'Études offers comprehensive consulting, management, design, and research solutions. Our vision is to be at the forefront of architectural innovation, fostering a global community of architects and enthusiasts united by a passion for creating spaces. Every architectural endeavor is an opportunity to shape the future.', 'Hidden answer on the details block', 'twentytwentyfour' ); ?></p> - <!-- /wp:paragraph --> - </details> - <!-- /wp:details --> + <!-- wp:separator {"style":{"spacing":{"margin":{"top":"var:preset|spacing|30","bottom":"var:preset|spacing|30"}}},"backgroundColor":"base","className":"is-style-wide"} --> + <hr class="wp-block-separator has-text-color has-base-color has-alpha-channel-opacity has-base-background-color has-background is-style-wide" style="margin-top:var(--wp--preset--spacing--30);margin-bottom:var(--wp--preset--spacing--30)"/> + <!-- /wp:separator --> + + <!-- wp:heading {"level":3,"align":"wide","style":{"elements":{"link":{"color":{"text":"var:preset|color|base-2"}}}},"textColor":"base-2"} --> + <h3 class="wp-block-heading alignwide has-base-2-color has-text-color has-link-color"><?php echo esc_html_x( 'Who is behind Études?', 'Question in the FAQ pattern', 'twentytwentyfour' ); ?></h3> + <!-- /wp:heading --> + <!-- wp:paragraph {"placeholder":"Type / to add a hidden block","style":{"elements":{"link":{"color":{"text":"var:preset|color|contrast-1"}}}},"textColor":"contrast-1"} --> + <p class="has-contrast-1-color has-text-color has-link-color"><?php echo esc_html_x( 'Études offers comprehensive consulting, management, design, and research solutions. Our vision is to be at the forefront of architectural innovation, fostering a global community of architects and enthusiasts united by a passion for creating spaces. Every architectural endeavor is an opportunity to shape the future.', 'Answer in the FAQ pattern', 'twentytwentyfour' ); ?></p> + <!-- /wp:paragraph --> - <!-- wp:details {"style":{"spacing":{"margin":{"top":"0"}},"border":{"top":{"width":"0px","style":"none"},"right":{"width":"0px","style":"none"},"bottom":{"color":"var:preset|color|base","style":"solid","width":"1px"},"left":{"width":"0px","style":"none"}}},"className":"is-style-arrow-icon-details","fontSize":"medium"} --> - <details class="wp-block-details is-style-arrow-icon-details has-medium-font-size" style="border-top-style:none;border-top-width:0px;border-right-style:none;border-right-width:0px;border-bottom-color:var(--wp--preset--color--base);border-bottom-style:solid;border-bottom-width:1px;border-left-style:none;border-left-width:0px;margin-top:0"> - <summary><?php echo esc_html_x( 'Who is behind Études?', 'Question on the details block', 'twentytwentyfour' ); ?></summary> - <!-- wp:paragraph {"placeholder":"Type / to add a hidden block","style":{"elements":{"link":{"color":{"text":"var:preset|color|contrast-1"}}}},"textColor":"contrast-1"} --> - <p class="has-contrast-1-color has-text-color has-link-color"><?php echo esc_html_x( 'Études offers comprehensive consulting, management, design, and research solutions. Our vision is to be at the forefront of architectural innovation, fostering a global community of architects and enthusiasts united by a passion for creating spaces. Every architectural endeavor is an opportunity to shape the future.', 'Hidden answer on the details block', 'twentytwentyfour' ); ?></p> - <!-- /wp:paragraph --> - </details> - <!-- /wp:details --> + <!-- wp:separator {"style":{"spacing":{"margin":{"top":"var:preset|spacing|30","bottom":"var:preset|spacing|30"}}},"backgroundColor":"base","className":"is-style-wide"} --> + <hr class="wp-block-separator has-text-color has-base-color has-alpha-channel-opacity has-base-background-color has-background is-style-wide" style="margin-top:var(--wp--preset--spacing--30);margin-bottom:var(--wp--preset--spacing--30)"/> + <!-- /wp:separator --> - <!-- wp:details {"style":{"spacing":{"margin":{"top":"0"}},"border":{"top":{"width":"0px","style":"none"},"right":{"width":"0px","style":"none"},"bottom":{"color":"var:preset|color|base","style":"solid","width":"1px"},"left":{"width":"0px","style":"none"}}},"className":"is-style-arrow-icon-details","fontSize":"medium"} --> - <details class="wp-block-details is-style-arrow-icon-details has-medium-font-size" style="border-top-style:none;border-top-width:0px;border-right-style:none;border-right-width:0px;border-bottom-color:var(--wp--preset--color--base);border-bottom-style:solid;border-bottom-width:1px;border-left-style:none;border-left-width:0px;margin-top:0"> - <summary><?php echo esc_html_x( 'I\'d like to get to meet fellow architects, how can I do that?', 'Question on the details block', 'twentytwentyfour' ); ?></summary> - <!-- wp:paragraph {"placeholder":"Type / to add a hidden block","style":{"elements":{"link":{"color":{"text":"var:preset|color|contrast-1"}}}},"textColor":"contrast-1"} --> - <p class="has-contrast-1-color has-text-color has-link-color"><?php echo esc_html_x( 'Études offers comprehensive consulting, management, design, and research solutions. Our vision is to be at the forefront of architectural innovation, fostering a global community of architects and enthusiasts united by a passion for creating spaces. Every architectural endeavor is an opportunity to shape the future.', 'Hidden answer on the details block', 'twentytwentyfour' ); ?></p> - <!-- /wp:paragraph --> - </details> - <!-- /wp:details --> + <!-- wp:heading {"level":3,"align":"wide","style":{"elements":{"link":{"color":{"text":"var:preset|color|base-2"}}}},"textColor":"base-2"} --> + <h3 class="wp-block-heading alignwide has-base-2-color has-text-color has-link-color"><?php echo esc_html_x( 'I\'d like to get to meet fellow architects, how can I do that?', 'Question in the FAQ pattern', 'twentytwentyfour' ); ?></h3> + <!-- /wp:heading --> + <!-- wp:paragraph {"placeholder":"Type / to add a hidden block","style":{"elements":{"link":{"color":{"text":"var:preset|color|contrast-1"}}}},"textColor":"contrast-1"} --> + <p class="has-contrast-1-color has-text-color has-link-color"><?php echo esc_html_x( 'Études offers comprehensive consulting, management, design, and research solutions. Our vision is to be at the forefront of architectural innovation, fostering a global community of architects and enthusiasts united by a passion for creating spaces. Every architectural endeavor is an opportunity to shape the future.', 'Answer in the FAQ pattern', 'twentytwentyfour' ); ?></p> + <!-- /wp:paragraph --> + + <!-- wp:separator {"style":{"spacing":{"margin":{"top":"var:preset|spacing|30","bottom":"var:preset|spacing|30"}}},"backgroundColor":"base","className":"is-style-wide"} --> + <hr class="wp-block-separator has-text-color has-base-color has-alpha-channel-opacity has-base-background-color has-background is-style-wide" style="margin-top:var(--wp--preset--spacing--30);margin-bottom:var(--wp--preset--spacing--30)"/> + <!-- /wp:separator --> - <!-- wp:details {"style":{"spacing":{"margin":{"top":"0"}},"border":{"top":{"width":"0px","style":"none"},"right":{"width":"0px","style":"none"},"bottom":{"color":"var:preset|color|base","style":"solid","width":"1px"},"left":{"width":"0px","style":"none"}}},"className":"is-style-arrow-icon-details","fontSize":"medium"} --> - <details class="wp-block-details is-style-arrow-icon-details has-medium-font-size" style="border-top-style:none;border-top-width:0px;border-right-style:none;border-right-width:0px;border-bottom-color:var(--wp--preset--color--base);border-bottom-style:solid;border-bottom-width:1px;border-left-style:none;border-left-width:0px;margin-top:0"> - <summary><?php echo esc_html_x( 'Can I apply to be a part of the team or work as a contractor?', 'Question on the details block', 'twentytwentyfour' ); ?></summary> - <!-- wp:paragraph {"placeholder":"Type / to add a hidden block","style":{"elements":{"link":{"color":{"text":"var:preset|color|contrast-1"}}}},"textColor":"contrast-1"} --> - <p class="has-contrast-1-color has-text-color has-link-color"><?php echo esc_html_x( 'Études offers comprehensive consulting, management, design, and research solutions. Our vision is to be at the forefront of architectural innovation, fostering a global community of architects and enthusiasts united by a passion for creating spaces. Every architectural endeavor is an opportunity to shape the future.', 'Hidden answer on the details block', 'twentytwentyfour' ); ?></p> - <!-- /wp:paragraph --> - </details> - <!-- /wp:details --> + <!-- wp:heading {"level":3,"align":"wide","style":{"elements":{"link":{"color":{"text":"var:preset|color|base-2"}}}},"textColor":"base-2"} --> + <h3 class="wp-block-heading alignwide has-base-2-color has-text-color has-link-color"><?php echo esc_html_x( 'Can I apply to be a part of the team or work as a contractor?', 'Question in the FAQ pattern', 'twentytwentyfour' ); ?></h3> + <!-- /wp:heading --> + <!-- wp:paragraph {"placeholder":"Type / to add a hidden block","style":{"elements":{"link":{"color":{"text":"var:preset|color|contrast-1"}}}},"textColor":"contrast-1"} --> + <p class="has-contrast-1-color has-text-color has-link-color"><?php echo esc_html_x( 'Études offers comprehensive consulting, management, design, and research solutions. Our vision is to be at the forefront of architectural innovation, fostering a global community of architects and enthusiasts united by a passion for creating spaces. Every architectural endeavor is an opportunity to shape the future.', 'Answer in the FAQ pattern', 'twentytwentyfour' ); ?></p> + <!-- /wp:paragraph --> <!-- wp:spacer {"height":"var:preset|spacing|10","style":{"spacing":{"margin":{"top":"var:preset|spacing|10","bottom":"0"}}}} --> <div style="margin-top:var(--wp--preset--spacing--10);margin-bottom:0;height:var(--wp--preset--spacing--10)" aria-hidden="true" class="wp-block-spacer"></div> diff --git a/wp-content/themes/twentytwentyfour/patterns/text-feature-grid-3-col.php b/wp-content/themes/twentytwentyfour/patterns/text-feature-grid-3-col.php index f03eaf3..03310f5 100644 --- a/wp-content/themes/twentytwentyfour/patterns/text-feature-grid-3-col.php +++ b/wp-content/themes/twentytwentyfour/patterns/text-feature-grid-3-col.php @@ -4,6 +4,7 @@ * Slug: twentytwentyfour/text-feature-grid-3-col * Categories: text, about * Viewport width: 1400 + * Description: A feature grid of 2 rows and 3 columns with headings and text. */ ?> diff --git a/wp-content/themes/twentytwentyfour/patterns/text-project-details.php b/wp-content/themes/twentytwentyfour/patterns/text-project-details.php index b75f869..a6a54c1 100644 --- a/wp-content/themes/twentytwentyfour/patterns/text-project-details.php +++ b/wp-content/themes/twentytwentyfour/patterns/text-project-details.php @@ -4,6 +4,7 @@ * Slug: twentytwentyfour/text-project-details * Categories: text, portfolio * Viewport width: 1400 + * Description: A text only section for project details. */ ?> diff --git a/wp-content/themes/twentytwentyfour/patterns/text-title-left-image-right.php b/wp-content/themes/twentytwentyfour/patterns/text-title-left-image-right.php index f4c48f7..cfcbf6d 100644 --- a/wp-content/themes/twentytwentyfour/patterns/text-title-left-image-right.php +++ b/wp-content/themes/twentytwentyfour/patterns/text-title-left-image-right.php @@ -4,6 +4,7 @@ * Slug: twentytwentyfour/text-title-left-image-right * Categories: banner, about, featured * Viewport width: 1400 + * Description: A title, a paragraph and a CTA button on the left with an image on the right. */ ?> diff --git a/wp-content/themes/twentytwentyfour/readme.txt b/wp-content/themes/twentytwentyfour/readme.txt index 50c9ff5..81a72a6 100644 --- a/wp-content/themes/twentytwentyfour/readme.txt +++ b/wp-content/themes/twentytwentyfour/readme.txt @@ -1,9 +1,9 @@ === Twenty Twenty-Four === Contributors: wordpressdotorg Requires at least: 6.4 -Tested up to: 6.5 +Tested up to: 6.6 Requires PHP: 7.0 -Stable tag: 1.1 +Stable tag: 1.2 License: GPLv2 or later License URI: http://www.gnu.org/licenses/gpl-2.0.html @@ -13,6 +13,11 @@ Twenty Twenty-Four is designed to be flexible, versatile and applicable to any w == Changelog == += 1.2 = +* Released: July 16, 2024 + +https://wordpress.org/documentation/article/twenty-twenty-four-changelog/#Version_1.2 + = 1.1 = * Released: April 2, 2024 diff --git a/wp-content/themes/twentytwentyfour/screenshot.png b/wp-content/themes/twentytwentyfour/screenshot.png Binary files differindex 74fa4c7..0bce237 100644 --- a/wp-content/themes/twentytwentyfour/screenshot.png +++ b/wp-content/themes/twentytwentyfour/screenshot.png diff --git a/wp-content/themes/twentytwentyfour/style.css b/wp-content/themes/twentytwentyfour/style.css index 75c9804..3fa6a6a 100644 --- a/wp-content/themes/twentytwentyfour/style.css +++ b/wp-content/themes/twentytwentyfour/style.css @@ -5,9 +5,9 @@ Author: the WordPress team Author URI: https://wordpress.org Description: Twenty Twenty-Four is designed to be flexible, versatile and applicable to any website. Its collection of templates and patterns tailor to different needs, such as presenting a business, blogging and writing or showcasing work. A multitude of possibilities open up with just a few adjustments to color and typography. Twenty Twenty-Four comes with style variations and full page designs to help speed up the site building process, is fully compatible with the site editor, and takes advantage of new design tools introduced in WordPress 6.4. Requires at least: 6.4 -Tested up to: 6.5 +Tested up to: 6.6 Requires PHP: 7.0 -Version: 1.1 +Version: 1.2 License: GNU General Public License v2 or later License URI: http://www.gnu.org/licenses/gpl-2.0.html Text Domain: twentytwentyfour diff --git a/wp-content/themes/twentytwentyfour/templates/home.html b/wp-content/themes/twentytwentyfour/templates/home.html index 7c364b8..196f82e 100644 --- a/wp-content/themes/twentytwentyfour/templates/home.html +++ b/wp-content/themes/twentytwentyfour/templates/home.html @@ -1 +1,9 @@ -<!-- wp:pattern {"slug":"twentytwentyfour/template-home-business"} /--> +<!-- wp:template-part {"slug":"header","area":"header","tagName":"header"} /--> + +<!-- wp:group {"tagName":"main","style":{"spacing":{"blockGap":"0","margin":{"top":"0"}}},"layout":{"type":"default"}} --> +<main class="wp-block-group" style="margin-top:0"> + <!-- wp:pattern {"slug":"twentytwentyfour/page-home-business"} /--> +</main> +<!-- /wp:group --> + +<!-- wp:template-part {"slug":"footer","area":"footer","tagName":"footer"} /--> diff --git a/wp-content/themes/twentytwentyfour/theme.json b/wp-content/themes/twentytwentyfour/theme.json index fe6bd3b..134da28 100644 --- a/wp-content/themes/twentytwentyfour/theme.json +++ b/wp-content/themes/twentytwentyfour/theme.json @@ -1,5 +1,5 @@ { - "$schema": "https://schemas.wp.org/trunk/theme.json", + "$schema": "https://schemas.wp.org/wp/6.5/theme.json", "version": 2, "patterns": [ "three-columns-of-services", diff --git a/wp-content/themes/twentytwentythree/parts/header.html b/wp-content/themes/twentytwentythree/parts/header.html index 8e4f17b..8a94130 100644 --- a/wp-content/themes/twentytwentythree/parts/header.html +++ b/wp-content/themes/twentytwentythree/parts/header.html @@ -3,7 +3,11 @@ <!-- wp:group {"align":"wide","style":{"spacing":{"padding":{"bottom":"var:preset|spacing|40"}}},"layout":{"type":"flex","justifyContent":"space-between"}} --> <div class="wp-block-group alignwide" style="padding-bottom:var(--wp--preset--spacing--40)"> <!-- wp:site-title {"level":0} /--> - <!-- wp:navigation {"layout":{"type":"flex","setCascadingProperties":true,"justifyContent":"right"}} /--> + <!-- wp:group {"layout":{"type":"flex","flexWrap":"wrap","justifyContent":"left"}} --> + <div class="wp-block-group"> + <!-- wp:navigation {"layout":{"type":"flex","setCascadingProperties":true,"justifyContent":"right"}} /--> + </div> + <!-- /wp:group --> </div> <!-- /wp:group --> </div> diff --git a/wp-content/themes/twentytwentythree/patterns/call-to-action.php b/wp-content/themes/twentytwentythree/patterns/call-to-action.php index 119677d..1542790 100644 --- a/wp-content/themes/twentytwentythree/patterns/call-to-action.php +++ b/wp-content/themes/twentytwentythree/patterns/call-to-action.php @@ -5,6 +5,7 @@ * Categories: featured * Keywords: Call to action * Block Types: core/buttons + * Description: Left-aligned text with a CTA button and a separator. */ ?> <!-- wp:columns {"align":"wide"} --> diff --git a/wp-content/themes/twentytwentythree/patterns/footer-default.php b/wp-content/themes/twentytwentythree/patterns/footer-default.php index d197bf5..e382724 100644 --- a/wp-content/themes/twentytwentythree/patterns/footer-default.php +++ b/wp-content/themes/twentytwentythree/patterns/footer-default.php @@ -4,6 +4,7 @@ * Slug: twentytwentythree/footer-default * Categories: footer * Block Types: core/template-part/footer + * Description: Footer with site title and powered by WordPress. */ ?> <!-- wp:group {"layout":{"type":"constrained"}} --> diff --git a/wp-content/themes/twentytwentythree/patterns/post-meta.php b/wp-content/themes/twentytwentythree/patterns/post-meta.php index b704064..a1a9226 100644 --- a/wp-content/themes/twentytwentythree/patterns/post-meta.php +++ b/wp-content/themes/twentytwentythree/patterns/post-meta.php @@ -5,6 +5,7 @@ * Categories: query * Keywords: post meta * Block Types: core/template-part/post-meta + * Description: Post meta information with separator on the top. */ ?> <!-- wp:spacer {"height":"0"} --> diff --git a/wp-content/themes/twentytwentythree/readme.txt b/wp-content/themes/twentytwentythree/readme.txt index c845ea5..3eef248 100644 --- a/wp-content/themes/twentytwentythree/readme.txt +++ b/wp-content/themes/twentytwentythree/readme.txt @@ -1,9 +1,9 @@ === Twenty Twenty-Three === Contributors: wordpressdotorg Requires at least: 6.1 -Tested up to: 6.5 +Tested up to: 6.6 Requires PHP: 5.6 -Stable tag: 1.4 +Stable tag: 1.5 License: GPLv2 or later License URI: http://www.gnu.org/licenses/gpl-2.0.html @@ -15,6 +15,11 @@ Whether you want to build a complex or incredibly simple website, you can do it == Changelog == += 1.5 = +* Released: July 16, 2024 + +https://wordpress.org/documentation/article/twenty-twenty-three-changelog/#Version_1.5 + = 1.4 = * Released: April 2, 2024 diff --git a/wp-content/themes/twentytwentythree/screenshot.png b/wp-content/themes/twentytwentythree/screenshot.png Binary files differindex dee93e4..417d979 100644 --- a/wp-content/themes/twentytwentythree/screenshot.png +++ b/wp-content/themes/twentytwentythree/screenshot.png diff --git a/wp-content/themes/twentytwentythree/style.css b/wp-content/themes/twentytwentythree/style.css index 273c757..94a23fc 100644 --- a/wp-content/themes/twentytwentythree/style.css +++ b/wp-content/themes/twentytwentythree/style.css @@ -5,9 +5,9 @@ Author: the WordPress team Author URI: https://wordpress.org Description: Twenty Twenty-Three is designed to take advantage of the new design tools introduced in WordPress 6.1. With a clean, blank base as a starting point, this default theme includes ten diverse style variations created by members of the WordPress community. Whether you want to build a complex or incredibly simple website, you can do it quickly and intuitively through the bundled styles or dive into creation and full customization yourself. Requires at least: 6.1 -Tested up to: 6.5 +Tested up to: 6.6 Requires PHP: 5.6 -Version: 1.4 +Version: 1.5 License: GNU General Public License v2 or later License URI: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html Text Domain: twentytwentythree diff --git a/wp-content/themes/twentytwentythree/styles/aubergine.json b/wp-content/themes/twentytwentythree/styles/aubergine.json index 235b04b2..485eaf5 100644 --- a/wp-content/themes/twentytwentythree/styles/aubergine.json +++ b/wp-content/themes/twentytwentythree/styles/aubergine.json @@ -11,7 +11,7 @@ "slug": "secondary-base" }, { - "gradient": "linear-gradient(180deg, var(--wp--preset--color--base) 0 min(24rem, 10%), var(--wp--preset--color--secondary) 0% 30%, var(--wp--preset--color--base) 100%)", + "gradient": "linear-gradient(180deg, var(--wp--preset--color--base) 0 clamp(10vh, 24rem, 14vh), var(--wp--preset--color--secondary) 0% 30%, var(--wp--preset--color--base) 100%)", "name": "Base to Secondary to Base", "slug": "base-secondary-base" }, diff --git a/wp-content/themes/twentytwentythree/templates/archive.html b/wp-content/themes/twentytwentythree/templates/archive.html index 74a8a5c..c09d1b9 100644 --- a/wp-content/themes/twentytwentythree/templates/archive.html +++ b/wp-content/themes/twentytwentythree/templates/archive.html @@ -18,8 +18,8 @@ <!-- /wp:post-template --> <!-- wp:query-pagination {"paginationArrow":"arrow","layout":{"type":"flex","justifyContent":"space-between"}} --> - <!-- wp:query-pagination-previous {"label":"Newer Posts"} /--> - <!-- wp:query-pagination-next {"label":"Older Posts"} /--> + <!-- wp:query-pagination-previous /--> + <!-- wp:query-pagination-next /--> <!-- /wp:query-pagination --> </div> <!-- /wp:query --> diff --git a/wp-content/themes/twentytwentythree/templates/home.html b/wp-content/themes/twentytwentythree/templates/home.html index 9b84d2b..23fc5cf 100644 --- a/wp-content/themes/twentytwentythree/templates/home.html +++ b/wp-content/themes/twentytwentythree/templates/home.html @@ -20,8 +20,8 @@ <!-- /wp:post-template --> <!-- wp:query-pagination {"paginationArrow":"arrow","align":"wide","layout":{"type":"flex","justifyContent":"space-between"}} --> - <!-- wp:query-pagination-previous {"label":"Newer Posts"} /--> - <!-- wp:query-pagination-next {"label":"Older Posts"} /--> + <!-- wp:query-pagination-previous /--> + <!-- wp:query-pagination-next /--> <!-- /wp:query-pagination --> </div> <!-- /wp:query --> diff --git a/wp-content/themes/twentytwentythree/templates/search.html b/wp-content/themes/twentytwentythree/templates/search.html index c80325d..53ec6ba 100644 --- a/wp-content/themes/twentytwentythree/templates/search.html +++ b/wp-content/themes/twentytwentythree/templates/search.html @@ -18,8 +18,8 @@ <!-- /wp:post-template --> <!-- wp:query-pagination {"paginationArrow":"arrow","layout":{"type":"flex","justifyContent":"space-between"}} --> - <!-- wp:query-pagination-previous {"label":"Newer Posts"} /--> - <!-- wp:query-pagination-next {"label":"Older Posts"} /--> + <!-- wp:query-pagination-previous /--> + <!-- wp:query-pagination-next /--> <!-- /wp:query-pagination --> <!-- wp:query-no-results --> diff --git a/wp-content/themes/twentytwentythree/theme.json b/wp-content/themes/twentytwentythree/theme.json index 32eb7ed..4ac5ac8 100644 --- a/wp-content/themes/twentytwentythree/theme.json +++ b/wp-content/themes/twentytwentythree/theme.json @@ -1,5 +1,5 @@ { - "$schema": "https://schemas.wp.org/trunk/theme.json", + "$schema": "https://schemas.wp.org/wp/6.5/theme.json", "version": 2, "customTemplates": [ { diff --git a/wp-content/themes/twentytwentytwo/parts/header.html b/wp-content/themes/twentytwentytwo/parts/header.html index 27568c1..9d0a314 100644 --- a/wp-content/themes/twentytwentytwo/parts/header.html +++ b/wp-content/themes/twentytwentytwo/parts/header.html @@ -5,9 +5,11 @@ <!-- wp:site-title /--></div> <!-- /wp:group --> - +<!-- wp:group {"layout":{"type":"flex","flexWrap":"wrap","justifyContent":"left"}} --> +<div class="wp-block-group"> <!-- wp:navigation {"layout":{"type":"flex","setCascadingProperties":true,"justifyContent":"right"}} --> <!-- wp:page-list {"isNavigationChild":true,"showSubmenuIcon":true,"openSubmenusOnClick":false} /--> <!-- /wp:navigation --></div> <!-- /wp:group --></div> +<!-- /wp:group --></div> <!-- /wp:group -->
\ No newline at end of file diff --git a/wp-content/themes/twentytwentytwo/readme.txt b/wp-content/themes/twentytwentytwo/readme.txt index 61bbb8f..74e6092 100644 --- a/wp-content/themes/twentytwentytwo/readme.txt +++ b/wp-content/themes/twentytwentytwo/readme.txt @@ -1,9 +1,9 @@ === Twenty Twenty-Two === Contributors: wordpressdotorg Requires at least: 5.9 -Tested up to: 6.5 +Tested up to: 6.6 Requires PHP: 5.6 -Stable tag: 1.7 +Stable tag: 1.8 License: GPLv2 or later License URI: http://www.gnu.org/licenses/gpl-2.0.html @@ -17,6 +17,11 @@ Whether you’re building a single-page website, a blog, a business website, or == Changelog == += 1.8 = +* Released: July 16, 2024 + +https://wordpress.org/documentation/article/twenty-twenty-two-changelog/#Version_1.8 + = 1.7 = * Released: April 2, 2024 diff --git a/wp-content/themes/twentytwentytwo/style.css b/wp-content/themes/twentytwentytwo/style.css index e1e26e9..3b41660 100644 --- a/wp-content/themes/twentytwentytwo/style.css +++ b/wp-content/themes/twentytwentytwo/style.css @@ -5,9 +5,9 @@ Author: the WordPress team Author URI: https://wordpress.org/ Description: Built on a solidly designed foundation, Twenty Twenty-Two embraces the idea that everyone deserves a truly unique website. The theme’s subtle styles are inspired by the diversity and versatility of birds: its typography is lightweight yet strong, its color palette is drawn from nature, and its layout elements sit gently on the page. The true richness of Twenty Twenty-Two lies in its opportunity for customization. The theme is built to take advantage of the Site Editor features introduced in WordPress 5.9, which means that colors, typography, and the layout of every single page on your site can be customized to suit your vision. It also includes dozens of block patterns, opening the door to a wide range of professionally designed layouts in just a few clicks. Whether you’re building a single-page website, a blog, a business website, or a portfolio, Twenty Twenty-Two will help you create a site that is uniquely yours. Requires at least: 5.9 -Tested up to: 6.5 +Tested up to: 6.6 Requires PHP: 5.6 -Version: 1.7 +Version: 1.8 License: GNU General Public License v2 or later License URI: http://www.gnu.org/licenses/gpl-2.0.html Text Domain: twentytwentytwo diff --git a/wp-content/themes/twentytwentytwo/theme.json b/wp-content/themes/twentytwentytwo/theme.json index ec9ff86..da4e623 100644 --- a/wp-content/themes/twentytwentytwo/theme.json +++ b/wp-content/themes/twentytwentytwo/theme.json @@ -1,5 +1,5 @@ { - "$schema": "https://schemas.wp.org/trunk/theme.json", + "$schema": "https://schemas.wp.org/wp/6.5/theme.json", "version": 2, "customTemplates": [ { |
