| @@ -52,9 +52,8 @@ | ||
| 52 | 52 | $iconurl = new maxField('hidden'); |
| 53 | 53 | $iconurl->id = $id . '_url'; |
| 54 | 54 | $iconurl->name = $iconurl->id; |
| 55 | 55 | $iconurl->value = $icon_url; |
| 56 | - | |
| 57 | 56 | $admin->addField($iconurl, '',''); |
| 58 | 57 | |
| 59 | 58 | $iconsize = new maxField('hidden'); |
| 60 | 59 | $iconsize->id = $id . '_size'; |
| @@ -59,12 +58,10 @@ | ||
| 59 | 58 | $iconsize = new maxField('hidden'); |
| 60 | 59 | $iconsize->id = $id . '_size'; |
| 61 | 60 | $iconsize->name = $iconsize->id; |
| 62 | 61 | $iconsize->value = $icon_size; |
| 63 | - | |
| 64 | 62 | $admin->addField($iconsize, '',''); |
| 65 | 63 | |
| 66 | - | |
| 67 | 64 | $iconpreview = new maxField('generic'); |
| 68 | 65 | $iconpreview->id = $id . '_option_preview'; |
| 69 | 66 | if ($args['hide']) |
| 70 | 67 | $iconpreview->main_class = 'option hidden'; |
| @@ -72,8 +69,32 @@ | ||
| 72 | 69 | $iconpreview->name = $iconpreview->id; |
| 73 | 70 | $iconpreview->start_conditional = $args['conditional']; |
| 74 | 71 | // $iconpreview->main_class = 'option icon_preview'; |
| 75 | 72 | |
| 73 | + if ($icon_id > 0) | |
| 74 | + { | |
| 75 | + $data = get_post($icon_id); | |
| 76 | + | |
| 77 | + if (! is_null($data)) | |
| 78 | + { | |
| 79 | + $icon_title = $data->post_title; | |
| 80 | + $icon_alt = get_post_meta( $icon_id, '_wp_attachment_image_alt', true ); | |
| 81 | + | |
| 82 | + $data = wp_get_attachment_image_src($icon_id, $icon_size); | |
| 83 | + | |
| 84 | + $filename = basename($data[0]); | |
| 85 | + $width = $data[1]; | |
| 86 | + $height = $data[2]; | |
| 87 | + } | |
| 88 | + else { | |
| 89 | + $icon_id = -1; // error state | |
| 90 | + $icon_url = ''; | |
| 91 | + } | |
| 92 | + } | |
| 93 | + else { | |
| 94 | + $filename = $icon_alt = $icon_title = ''; | |
| 95 | + } | |
| 96 | + | |
| 76 | 97 | $content = ''; |
| 77 | 98 | $content .= '<span class="image_' . $id . '_preview the_icon_preview non-fa">'; |
| 78 | 99 | if (isset($icon_url) && $icon_url != '') |
| 79 | 100 | { |
| @@ -78,27 +99,10 @@ | ||
| 78 | 99 | if (isset($icon_url) && $icon_url != '') |
| 79 | 100 | { |
| 80 | 101 | $content .= '<img src="' . $icon_url . '">'; |
| 81 | 102 | } |
| 82 | - $content .= '<span class="remove_icon dashicons dashicons-dismiss" data-key="' . $id . '"></span></span>'; | |
| 103 | + $content .= '<span class="remove_icon dashicons dashicons-dismiss" data-key="' . $id . '"></span></span>'; | |
| 83 | 104 | |
| 84 | - | |
| 85 | - | |
| 86 | - if ($icon_id > 0) | |
| 87 | - { | |
| 88 | - $data = get_post($icon_id); | |
| 89 | - $icon_title = $data->post_title; | |
| 90 | - $icon_alt = get_post_meta( $icon_id, '_wp_attachment_image_alt', true ); | |
| 91 | - | |
| 92 | - $data = wp_get_attachment_image_src($icon_id, $icon_size); | |
| 93 | - | |
| 94 | - $filename = basename($data[0]); | |
| 95 | - $width = $data[1]; | |
| 96 | - $height = $data[2]; | |
| 97 | - } | |
| 98 | - else { | |
| 99 | - $filename = $icon_alt = $icon_title = ''; | |
| 100 | - } | |
| 101 | 105 | |
| 102 | 106 | if ($args['show_image_data']) |
| 103 | 107 | { |
| 104 | 108 | $content .= "<span class='" . $id . "_data the_icon_data'>"; |