~canonical-sysadmins/wordpress/4.9.5

« back to all changes in this revision

Viewing changes to wp-includes/class-wp-customize-manager.php

  • Committer: Barry Price
  • Date: 2017-09-20 02:35:11 UTC
  • mfrom: (1.1.28 upstream)
  • Revision ID: barry.price@canonical.com-20170920023511-9bvjr2gseb4rb1e4
Merge WP4.8.2 from upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
265
265
                }
266
266
 
267
267
                $this->original_stylesheet = get_stylesheet();
268
 
                $this->theme = wp_get_theme( $args['theme'] );
 
268
                $this->theme = wp_get_theme( 0 === validate_file( $args['theme'] ) ? $args['theme'] : null );
269
269
                $this->messenger_channel = $args['messenger_channel'];
270
270
                $this->_changeset_uuid = $args['changeset_uuid'];
271
271