From b6a783ce4bea8941973c629e6e124207911e28d3 Mon Sep 17 00:00:00 2001 From: Josh Darby Date: Sun, 13 Jun 2021 18:36:31 -0400 Subject: [PATCH] Update INN_* constants --- docs/developers/constants.rst | 12 ++---------- functions.php | 19 ++++--------------- options.php | 10 ---------- partials/footer-boilerplate.php | 9 +++------ 4 files changed, 9 insertions(+), 41 deletions(-) diff --git a/docs/developers/constants.rst b/docs/developers/constants.rst index 54eaa19c7..c1be6ee03 100644 --- a/docs/developers/constants.rst +++ b/docs/developers/constants.rst @@ -25,17 +25,9 @@ For more information about how Largo handles image sizes, see `Image Sizes `_. - - ``INN_MEMBER`` is defined as true in ``functions.php`` if it is not otherwise defined and if ``INN_HOSTED`` is true. If ``INN_HOSTED`` is false, then ``INN_MEMBER`` will also be false unless ``INN_MEMBER`` is explicitly defined in ``wp_config.php`` or in the ``functions.php`` of a child theme. + ``WPB_HOSTED`` indicates whether or not a WordPress instance is hosted by WP Buddy. This setting should be set in ``wp-config.php``, but there is no reason for you to set this. .. php:const:: LARGO_DEBUG diff --git a/functions.php b/functions.php index 0e65c54bf..3c554dd7d 100644 --- a/functions.php +++ b/functions.php @@ -30,23 +30,12 @@ */ /** - * By default we'll assume the site is not hosted by INN. + * By default we'll assume the site is not hosted by WPB. * - * There should be no reason to set this. It is defined to - * modify the default value of 'INN_MEMBER' below to true for - * INN hosted sites. + * There should be no reason to set this. */ -if ( ! defined( 'INN_HOSTED' ) ) - define( 'INN_HOSTED', FALSE ); - -/** - * By default we'll assume the site is not for an INN member. - * - * Set INN_MEMBER to TRUE to show an INN logo in the footer - * and a widget of INN member stories in the homepage sidebar - */ -if ( ! defined( 'INN_MEMBER' ) ) - define( 'INN_MEMBER', FALSE || INN_HOSTED ); +if ( ! defined( 'WPB_HOSTED' ) ) + define( 'WPB_HOSTED', FALSE ); /** * LARGO_DEBUG defines whether or not to use minified assets diff --git a/options.php b/options.php index 4c16dd20b..1c01d1843 100644 --- a/options.php +++ b/options.php @@ -758,16 +758,6 @@ function optionsframework_options() { 'type' => 'checkbox', ); - -/* - * Removing inn_member_since in 0.5.2 - if ( INN_MEMBER ) { // only relevant in this case, options affecting the logo display - $options[] = array( - 'name' => __('INN Membership Options', 'largo'), - 'type' => 'info'); - } -*/ - return apply_filters('largo_options', $options); } diff --git a/partials/footer-boilerplate.php b/partials/footer-boilerplate.php index 0254a3afb..a8b28e77f 100644 --- a/partials/footer-boilerplate.php +++ b/partials/footer-boilerplate.php @@ -20,15 +20,12 @@
- - - -