~canonical-sysadmins/wordpress/4.7.1

« back to all changes in this revision

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

  • Committer: Barry Price
  • Date: 2016-06-22 02:23:41 UTC
  • mfrom: (1.1.17 upstream)
  • Revision ID: barry.price@canonical.com-20160622022341-9qrp2nesacwfx017
Merge WP4.5.3 from upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
1061
1061
         * @return array
1062
1062
         */
1063
1063
        public function preview_sidebars_widgets( $sidebars_widgets ) {
1064
 
                $sidebars_widgets = get_option( 'sidebars_widgets' );
 
1064
                $sidebars_widgets = get_option( 'sidebars_widgets', array() );
1065
1065
 
1066
1066
                unset( $sidebars_widgets['array_version'] );
1067
1067
                return $sidebars_widgets;