- fixed activation at multisite (issue #319);

- small notices fixes;
This commit is contained in:
nikitozzzzzzz
2017-09-14 17:39:26 +03:00
parent 2c56b9c1f4
commit de3355e059
2 changed files with 2 additions and 4 deletions
+1 -1
View File
@@ -585,7 +585,7 @@ if ( ! class_exists( 'Admin_Forms' ) ) {
$name_attr = ' name="' . $name . '" ';
$default = isset( $field_data['default'] ) ? $field_data['default'] : '';
$value = ( '' !== $field_data['value'] ) ? $field_data['value'] : $default;
$value = ( isset( $field_data['value'] ) && '' !== $field_data['value'] ) ? $field_data['value'] : $default;
/*$value = isset( $field_data['value'] ) ? $field_data['value'] : $default;
$value = ! empty( $field_data['value'] ) ? $field_data['value'] : 0;
*/
+1 -3
View File
@@ -72,8 +72,6 @@ if ( ! class_exists( 'Permalinks' ) ) {
*** @Get current URL anywhere
***/
function get_current_url( $no_query_params = false ) {
global $post;
$um_get_option = get_option('um_options');
$server_name_method = isset( $um_get_option['current_url_method'] ) ? $um_get_option['current_url_method'] : 'SERVER_NAME';
@@ -94,7 +92,7 @@ if ( ! class_exists( 'Permalinks' ) ) {
}
} else {*/
$network_permalink_structure = um_get_option("network_permalink_structure");
$network_permalink_structure = UM()->um_get_option("network_permalink_structure");
if( $network_permalink_structure == "sub-directory" ){