Skip to content

Commit d118f44

Browse files
authored
Merge branch 'trunk' into dependabot/npm_and_yarn/simple-icons-11.5.0
2 parents adf0406 + c4af29d commit d118f44

File tree

419 files changed

+1982
-377
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

419 files changed

+1982
-377
lines changed

.wordpress-org/banner-1544x500.png

-128 KB
Loading

.wordpress-org/banner-772x250.png

-66.9 KB
Loading

.wordpress-org/banner.pxm

-835 KB
Binary file not shown.

.wordpress-org/icon-128x128.png

-5 KB
Loading

.wordpress-org/icon-256x256.png

-9.41 KB
Loading

.wordpress-org/icon.svg

Lines changed: 6 additions & 0 deletions
Loading

Gruntfile.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ module.exports = function (grunt) {
6464
files : { // Dictionary of files.
6565

6666
'static/css/indieweb.css': 'sass/main.scss', // 'destination': 'source'
67+
'static/css/indieweb-minimal.css': 'sass/min.scss', // 'destination': 'source'
6768
'static/css/indieweb-bw.css': 'sass/main-bw.scss',
6869
'static/css/indieweb-admin.css': 'sass/main-admin.scss'
6970
}

includes/class-hcard-author-widget.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ public function __construct() {
1616
'HCard_Widget', // Base ID
1717
'Author Profile H-Card Widget', // Name
1818
array(
19-
'classname' => 'hcard_widget',
20-
'description' => __( 'A widget that allows you to display author profile marked up as an h-card', 'indieweb' ),
19+
'classname' => 'hcard_widget',
20+
'description' => __( 'A widget that allows you to display author profile marked up as an h-card', 'indieweb' ),
2121
'show_instance_in_rest' => true,
2222
)
2323
);

includes/class-hcard-user.php

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public static function silos() {
5555
),
5656
'twitter' => array(
5757
'baseurl' => 'https://twitter.com/%s',
58-
'display' => __( 'Twitter username (without @)', 'indieweb' ),
58+
'display' => __( 'X/Twitter username (without @)', 'indieweb' ),
5959
),
6060
'facebook' => array(
6161
'baseurl' => 'https://www.facebook.com/%s',
@@ -73,6 +73,15 @@ public static function silos() {
7373
'baseurl' => 'https://www.flickr.com/people/%s',
7474
'display' => __( 'Flickr username', 'indieweb' ),
7575
),
76+
'bluesky' => array(
77+
'baseurl' => 'https://bsky.app/profile/%s',
78+
'display' => __( 'Bluesky Username', 'indieweb' ),
79+
),
80+
81+
'reddit' => array(
82+
'baseurl' => 'https://reddit.com/user/%s',
83+
'display' => __( 'Reddit Username', 'indieweb' ),
84+
),
7685
'mastodon' => array(
7786
'baseurl' => '%s',
7887
'display' => __( 'Mastodon Server (URL)', 'indieweb' ),
@@ -254,9 +263,13 @@ public static function clean_url( $string ) {
254263
if ( ! filter_var( $url, FILTER_VALIDATE_URL ) ) {
255264
return false;
256265
}
266+
$host = wp_parse_url( $url, PHP_URL_HOST );
267+
if ( ! $host ) {
268+
return false;
269+
}
257270
// Rewrite these to https as needed
258271
$secure = apply_filters( 'iwc_rewrite_secure', array( 'facebook.com', 'twitter.com', 'github.com' ) );
259-
if ( in_array( preg_replace( '/^www\./', '', wp_parse_url( $url, PHP_URL_HOST ) ), $secure, true ) ) {
272+
if ( in_array( preg_replace( '/^www\./', '', $host ), $secure, true ) ) {
260273
$url = preg_replace( '/^http:/i', 'https:', $url );
261274
}
262275
$url = esc_url_raw( $url );

includes/class-relme-domain-icon-map.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ class Rel_Me_Domain_Icon_Map {
3030
'primal.net' => 'nostr',
3131
'habla.news' => 'nostr',
3232
'nostr.band' => 'nostr',
33-
'bsky.app' => 'bsky',
34-
'bsky.social' => 'bsky'
33+
'bsky.app' => 'bluesky',
34+
'bsky.social' => 'bluesky',
3535

3636
);
3737

0 commit comments

Comments
 (0)