← Back to branch summary

~canonical-sysadmins/wordpress/4.8

« back to all changes in this revision

Viewing changes to wp-includes/ms-default-constants.php

  • Committer: Barry Price
  • Date: 2016-08-17 04:50:12 UTC
  • mfrom: (1.1.18 upstream)
  • Revision ID: barry.price@canonical.com-20160817045012-qfui81zhqnqv2ba9
Merge WP4.6 from upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
wp-includes/ms-default-constants.php
140
140
                if ( $subdomain_error_warn ) {
141
141
                        trigger_error( __( '<strong>Conflicting values for the constants VHOST and SUBDOMAIN_INSTALL.</strong> The value of SUBDOMAIN_INSTALL will be assumed to be your subdomain configuration setting.' ) . ' ' . $vhost_deprecated, E_USER_WARNING );
142
142
                } else {
143
 
                        _deprecated_argument( 'define()', '3.0', $vhost_deprecated );
 
143
                        _deprecated_argument( 'define()', '3.0.0', $vhost_deprecated );
144
144
                }
145
145
                return;
146
146
        }