← Back to branch summary

~canonical-sysadmins/wordpress/4.7

« back to all changes in this revision

Viewing changes to wp-admin/includes/class-wp-site-icon.php

  • Committer: Haw Loeung
  • Date: 2016-12-13 06:56:21 UTC
  • mfrom: (1.1.20 upstream)
  • Revision ID: haw.loeung@canonical.com-20161213065621-8tcu7u7vlxgs2s81
Merge WP4.7 from upstream.

Show diffs side-by-side

added added

removed removed

Lines of Context:
wp-admin/includes/class-wp-site-icon.php
240
240
                return $value;
241
241
        }
242
242
}
243
 
 
244
 
/**
245
 
 * @global WP_Site_Icon $wp_site_icon
246
 
 */
247
 
$GLOBALS['wp_site_icon'] = new WP_Site_Icon;