From 111953608594e4e10fa1a8cb5332f67c6b162005 Mon Sep 17 00:00:00 2001
From: Scott Taylor <scott.c.taylor@mac.com>
Date: Mon, 22 Aug 2016 21:51:28 +0000
Subject: [PATCH] Widgets: `$option_name` and `$alt_option_name` have been used
 as members ever since `WP_Widget` became an object in 2.8, but never
 declared.

See #37771.

Built from https://develop.svn.wordpress.org/trunk@38318


git-svn-id: http://core.svn.wordpress.org/trunk@38259 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/class-wp-widget.php | 18 ++++++++++++++++++
 wp-includes/version.php         |  2 +-
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/wp-includes/class-wp-widget.php b/wp-includes/class-wp-widget.php
index 44f3686ddc..de9db07cc9 100644
--- a/wp-includes/class-wp-widget.php
+++ b/wp-includes/class-wp-widget.php
@@ -37,6 +37,24 @@ class WP_Widget {
 	 */
 	public $name;
 
+	/**
+	 * Option name for this widget type.
+	 *
+	 * @since 2.8.0
+	 * @access public
+	 * @var string
+	 */
+	public $option_name;
+
+	/**
+	 * Alt option name for this widget type.
+	 *
+	 * @since 2.8.0
+	 * @access public
+	 * @var string
+	 */
+	public $alt_option_name;
+
 	/**
 	 * Option array passed to wp_register_sidebar_widget().
 	 *
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 964cbc3095..ae0d8a1239 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.7-alpha-38317';
+$wp_version = '4.7-alpha-38318';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.