| @@ -131,11 +131,11 @@ | ||
| 131 | 131 | $unselected[] = $network; |
| 132 | 132 | if ($priority == 'readmore') |
| 133 | 133 | $readmore[] = $network; |
| 134 | 134 | |
| 135 | + | |
| 135 | 136 | if ($network->get('network') == 'maxbutton' && $priority != 'readmore') // exceptions |
| 136 | 137 | { |
| 137 | - | |
| 138 | 138 | $readmore[] = $network; |
| 139 | 139 | } |
| 140 | 140 | |
| 141 | 141 | |
| @@ -140,8 +140,9 @@ | ||
| 140 | 140 | |
| 141 | 141 | |
| 142 | 142 | } // foreach networks |
| 143 | 143 | |
| 144 | + | |
| 144 | 145 | // Sort networks by order saved. |
| 145 | 146 | ksort($selected); |
| 146 | 147 | return array('selected' => $selected, 'unselected' => $unselected, 'readmore' => $readmore); |
| 147 | 148 | } |
| @@ -191,30 +192,12 @@ | ||
| 191 | 192 | case 'nucleo': |
| 192 | 193 | $output = "<span class='mb-icon'><i class='$icon_type $icon' title='$title' > </i></span>"; |
| 193 | 194 | break; |
| 194 | 195 | case 'svg': |
| 195 | - case 'png': // via network settings, or whatever. | |
| 196 | + case 'png': | |
| 196 | 197 | $output = "<span class='mb-icon " . $icon_type . "'><img src='" . $icon . "' alt='" . $title . "'></span>"; |
| 197 | 198 | break; |
| 198 | - case 'image': // via media uploader | |
| 199 | - case 'image-remote': | |
| 200 | - if ($icon_type == 'image-remote') // when loading a custom network, before import | |
| 201 | - { | |
| 202 | - $url = $args['image_url']; | |
| 203 | - $output = '<img src="' . $url . '" border="0" />'; | |
| 204 | - } | |
| 205 | - else { | |
| 206 | - $image_id = isset($args['image_id']) ? $args['image_id'] : false; | |
| 207 | - $image_size = isset($args['image_size']) ? $args['image_size'] : false; | |
| 208 | 199 | |
| 209 | - $img_data = wp_get_attachment_image_src($image_id, $image_size); | |
| 210 | - | |
| 211 | - $width = $img_data[1]; | |
| 212 | - $height = $img_data[2]; | |
| 213 | - $url = $img_data[0]; | |
| 214 | - $output = '<span class="mb-icon ' . $icon_type . '"><img src="' . $url . '" width="' . $width . '" height="' . $height . '" border="0" /></span>'; | |
| 215 | - } | |
| 216 | - break; | |
| 217 | 200 | default: |
| 218 | 201 | $output = ''; |
| 219 | 202 | break; |
| 220 | 203 | } |
| @@ -219,38 +202,8 @@ | ||
| 219 | 202 | break; |
| 220 | 203 | } |
| 221 | 204 | |
| 222 | 205 | return apply_filters('display/render/icon', $output, $args); |
| 223 | - } | |
| 224 | - | |
| 225 | - public function applyVars($string) | |
| 226 | - { | |
| 227 | - //$vars = $this->getShareData(); | |
| 228 | - $w = MBSocial()->whistle(); | |
| 229 | - | |
| 230 | - preg_match_all('/\{(.*?)\}/im', $string, $matches); | |
| 231 | - //$vars = (isset($vars[0]) && count($vars[0]) > 0) ? $vars[0] : array(); | |
| 232 | - | |
| 233 | - if (count($matches) == 0) | |
| 234 | - return $string; | |
| 235 | - | |
| 236 | - $vars = $matches[0]; // i.e. {url} | |
| 237 | - $clean_vars = $matches[1]; // i.e. url | |
| 238 | - | |
| 239 | - for($i = 0; $i < count($vars); $i++) | |
| 240 | - { | |
| 241 | - $var = $vars[$i]; | |
| 242 | - $clean_var = $clean_vars[$i]; | |
| 243 | - | |
| 244 | - if (strpos($string, $var) !== false) | |
| 245 | - { | |
| 246 | - $val = $w->ask('display/vars/' . $clean_var); | |
| 247 | - $string = str_replace($var, $val, $string); | |
| 248 | - } | |
| 249 | - | |
| 250 | - } | |
| 251 | - | |
| 252 | - return $string; | |
| 253 | 206 | } |
| 254 | 207 | |
| 255 | 208 | public function header( $args = array() ) |
| 256 | 209 | { |
