From 76e6cc67c2ae54a484d066047fb69f1411dfe60e Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Mon, 1 Apr 2019 11:56:52 +0000 Subject: [PATCH] Bundled Themes: Link to an updated documentation on child themes on developer.wordpress.org, instead of Codex. Props man4toman, andraganescu. Fixes #46450. Built from https://develop.svn.wordpress.org/trunk@45081 git-svn-id: http://core.svn.wordpress.org/trunk@44890 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-content/themes/twentyeleven/functions.php | 12 +++++++----- wp-content/themes/twentyfifteen/functions.php | 2 +- wp-content/themes/twentyfourteen/functions.php | 2 +- wp-content/themes/twentysixteen/functions.php | 2 +- wp-content/themes/twentyten/functions.php | 12 +++++++----- wp-content/themes/twentythirteen/functions.php | 13 +++++++------ wp-content/themes/twentytwelve/functions.php | 12 +++++++----- wp-includes/version.php | 2 +- 8 files changed, 32 insertions(+), 25 deletions(-) diff --git a/wp-content/themes/twentyeleven/functions.php b/wp-content/themes/twentyeleven/functions.php index 1654d391e6..b3b1466ef4 100644 --- a/wp-content/themes/twentyeleven/functions.php +++ b/wp-content/themes/twentyeleven/functions.php @@ -9,11 +9,13 @@ * The first function, twentyeleven_setup(), sets up the theme by registering support * for various features in WordPress, such as post thumbnails, navigation menus, and the like. * - * When using a child theme (see https://codex.wordpress.org/Theme_Development and - * https://codex.wordpress.org/Child_Themes), you can override certain functions - * (those wrapped in a function_exists() call) by defining them first in your child theme's - * functions.php file. The child theme's functions.php file is included before the parent - * theme's file, so the child theme functions would be used. + * When using a child theme you can override certain functions (those wrapped + * in a function_exists() call) by defining them first in your child theme's + * functions.php file. The child theme's functions.php file is included before + * the parent theme's file, so the child theme functions would be used. + * + * @link https://codex.wordpress.org/Theme_Development + * @link https://developer.wordpress.org/themes/advanced-topics/child-themes/ * * Functions that are not pluggable (not wrapped in function_exists()) are instead attached * to a filter or action hook. The hook can be removed by using remove_action() or diff --git a/wp-content/themes/twentyfifteen/functions.php b/wp-content/themes/twentyfifteen/functions.php index 2713ba2cc3..201fb2b3fa 100644 --- a/wp-content/themes/twentyfifteen/functions.php +++ b/wp-content/themes/twentyfifteen/functions.php @@ -12,7 +12,7 @@ * the parent theme's file, so the child theme functions would be used. * * @link https://codex.wordpress.org/Theme_Development - * @link https://codex.wordpress.org/Child_Themes + * @link https://developer.wordpress.org/themes/advanced-topics/child-themes/ * * Functions that are not pluggable (not wrapped in function_exists()) are * instead attached to a filter or action hook. diff --git a/wp-content/themes/twentyfourteen/functions.php b/wp-content/themes/twentyfourteen/functions.php index e705a54609..c017dac644 100644 --- a/wp-content/themes/twentyfourteen/functions.php +++ b/wp-content/themes/twentyfourteen/functions.php @@ -12,7 +12,7 @@ * the parent theme's file, so the child theme functions would be used. * * @link https://codex.wordpress.org/Theme_Development - * @link https://codex.wordpress.org/Child_Themes + * @link https://developer.wordpress.org/themes/advanced-topics/child-themes/ * * Functions that are not pluggable (not wrapped in function_exists()) are * instead attached to a filter or action hook. diff --git a/wp-content/themes/twentysixteen/functions.php b/wp-content/themes/twentysixteen/functions.php index 2c47a2d289..5dbd51217b 100644 --- a/wp-content/themes/twentysixteen/functions.php +++ b/wp-content/themes/twentysixteen/functions.php @@ -12,7 +12,7 @@ * the parent theme's file, so the child theme functions would be used. * * @link https://codex.wordpress.org/Theme_Development - * @link https://codex.wordpress.org/Child_Themes + * @link https://developer.wordpress.org/themes/advanced-topics/child-themes/ * * Functions that are not pluggable (not wrapped in function_exists()) are * instead attached to a filter or action hook. diff --git a/wp-content/themes/twentyten/functions.php b/wp-content/themes/twentyten/functions.php index 4072713d2c..a3617c6a1a 100644 --- a/wp-content/themes/twentyten/functions.php +++ b/wp-content/themes/twentyten/functions.php @@ -9,11 +9,13 @@ * The first function, twentyten_setup(), sets up the theme by registering support * for various features in WordPress, such as post thumbnails, navigation menus, and the like. * - * When using a child theme (see https://codex.wordpress.org/Theme_Development and - * https://codex.wordpress.org/Child_Themes), you can override certain functions - * (those wrapped in a function_exists() call) by defining them first in your child theme's - * functions.php file. The child theme's functions.php file is included before the parent - * theme's file, so the child theme functions would be used. + * When using a child theme you can override certain functions (those wrapped + * in a function_exists() call) by defining them first in your child theme's + * functions.php file. The child theme's functions.php file is included before + * the parent theme's file, so the child theme functions would be used. + * + * @link https://codex.wordpress.org/Theme_Development + * @link https://developer.wordpress.org/themes/advanced-topics/child-themes/ * * Functions that are not pluggable (not wrapped in function_exists()) are instead attached * to a filter or action hook. The hook can be removed by using remove_action() or diff --git a/wp-content/themes/twentythirteen/functions.php b/wp-content/themes/twentythirteen/functions.php index dd3dec7cea..12ca2ea745 100644 --- a/wp-content/themes/twentythirteen/functions.php +++ b/wp-content/themes/twentythirteen/functions.php @@ -6,12 +6,13 @@ * theme as custom template tags. Others are attached to action and filter * hooks in WordPress to change core functionality. * - * When using a child theme (see https://codex.wordpress.org/Theme_Development - * and https://codex.wordpress.org/Child_Themes), you can override certain - * functions (those wrapped in a function_exists() call) by defining them first - * in your child theme's functions.php file. The child theme's functions.php - * file is included before the parent theme's file, so the child theme - * functions would be used. + * When using a child theme you can override certain functions (those wrapped + * in a function_exists() call) by defining them first in your child theme's + * functions.php file. The child theme's functions.php file is included before + * the parent theme's file, so the child theme functions would be used. + * + * @link https://codex.wordpress.org/Theme_Development + * @link https://developer.wordpress.org/themes/advanced-topics/child-themes/ * * Functions that are not pluggable (not wrapped in function_exists()) are * instead attached to a filter or action hook. diff --git a/wp-content/themes/twentytwelve/functions.php b/wp-content/themes/twentytwelve/functions.php index 95a7299a73..22c212edbe 100644 --- a/wp-content/themes/twentytwelve/functions.php +++ b/wp-content/themes/twentytwelve/functions.php @@ -6,11 +6,13 @@ * in the theme as custom template tags. Others are attached to action and * filter hooks in WordPress to change core functionality. * - * When using a child theme (see https://codex.wordpress.org/Theme_Development and - * https://codex.wordpress.org/Child_Themes), you can override certain functions - * (those wrapped in a function_exists() call) by defining them first in your child theme's - * functions.php file. The child theme's functions.php file is included before the parent - * theme's file, so the child theme functions would be used. + * When using a child theme you can override certain functions (those wrapped + * in a function_exists() call) by defining them first in your child theme's + * functions.php file. The child theme's functions.php file is included before + * the parent theme's file, so the child theme functions would be used. + * + * @link https://codex.wordpress.org/Theme_Development + * @link https://developer.wordpress.org/themes/advanced-topics/child-themes/ * * Functions that are not pluggable (not wrapped in function_exists()) are instead attached * to a filter or action hook. diff --git a/wp-includes/version.php b/wp-includes/version.php index 4c076217b9..2cb067d396 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -13,7 +13,7 @@ * * @global string $wp_version */ -$wp_version = '5.2-beta1-45080'; +$wp_version = '5.2-beta1-45081'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.