| @@ -228,38 +228,15 @@ | ||
| 228 | 228 | * @param string $title optional title attribute |
| 229 | 229 | * @param string $alt optional alt attribute |
| 230 | 230 | */ |
| 231 | 231 | public static function get_flag_html( $flag, $title = '', $alt = '' ) { |
| 232 | - if ( empty( $flag['src'] ) ) { | |
| 233 | - return ''; | |
| 234 | - } | |
| 235 | - | |
| 236 | - $title_attr = empty( $title ) ? '' : sprintf( ' title="%s"', esc_attr( $title ) ); | |
| 237 | - $alt_attr = empty( $alt ) ? '' : sprintf( ' alt="%s"', esc_attr( $alt ) ); | |
| 238 | - $width_attr = empty( $flag['width'] ) ? '' : sprintf( ' width="%s"', (int) $flag['width'] ); | |
| 239 | - $height_attr = empty( $flag['height'] ) ? '' : sprintf( ' height="%s"', (int) $flag['height'] ); | |
| 240 | - | |
| 241 | - $style = ''; | |
| 242 | - $sizes = array_intersect_key( $flag, array_flip( array( 'width', 'height' ) ) ); | |
| 243 | - | |
| 244 | - if ( ! empty( $sizes ) ) { | |
| 245 | - array_walk( | |
| 246 | - $sizes, | |
| 247 | - function ( &$value, $key ) { | |
| 248 | - $value = sprintf( '%s: %dpx;', esc_attr( $key ), (int) $value ); | |
| 249 | - } | |
| 250 | - ); | |
| 251 | - $style = sprintf( ' style="%s"', implode( ' ', $sizes ) ); | |
| 252 | - } | |
| 253 | - | |
| 254 | - return sprintf( | |
| 255 | - '<img src="%s"%s%s%s%s%s />', | |
| 232 | + return empty( $flag['src'] ) ? '' : sprintf( | |
| 233 | + '<img src="%s"%s%s%s%s />', | |
| 256 | 234 | $flag['src'], |
| 257 | - $title_attr, | |
| 258 | - $alt_attr, | |
| 259 | - $width_attr, | |
| 260 | - $height_attr, | |
| 261 | - $style | |
| 235 | + empty( $title ) ? '' : sprintf( ' title="%s"', esc_attr( $title ) ), | |
| 236 | + empty( $alt ) ? '' : sprintf( ' alt="%s"', esc_attr( $alt ) ), | |
| 237 | + empty( $flag['width'] ) ? '' : sprintf( ' width="%s"', (int) $flag['width'] ), | |
| 238 | + empty( $flag['height'] ) ? '' : sprintf( ' height="%s"', (int) $flag['height'] ) | |
| 262 | 239 | ); |
| 263 | 240 | } |
| 264 | 241 | |
| 265 | 242 | /** |
| @@ -276,9 +253,9 @@ | ||
| 276 | 253 | * |
| 277 | 254 | * @since 2.8 |
| 278 | 255 | */ |
| 279 | 256 | public function get_display_flag_url() { |
| 280 | - return empty( $this->custom_flag_url ) ? $this->flag_url : $this->custom_flag_url; | |
| 257 | + return empty( $this->custom_flag_url ) ? $this->flag : $this->custom_flag_url; | |
| 281 | 258 | } |
| 282 | 259 | |
| 283 | 260 | /** |
| 284 | 261 | * Updates post and term count |
