Skip to content

Commit

Permalink
2.0.0.50
Browse files Browse the repository at this point in the history
  • Loading branch information
stiofan committed Apr 1, 2019
1 parent e6bf95f commit 70580ec
Show file tree
Hide file tree
Showing 10 changed files with 166 additions and 147 deletions.
2 changes: 1 addition & 1 deletion assets/css/admin.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion assets/css/admin.css.map

Large diffs are not rendered by default.

9 changes: 9 additions & 0 deletions assets/css/admin.scss
Original file line number Diff line number Diff line change
Expand Up @@ -1443,6 +1443,15 @@ input[name="street"].ui-autocomplete-loading {
font-weight: 700;
}

.gd_plugin_upgrade_notice{
background: #ca1111;
color: #fff;
padding: 10px;
a{
color: #fff;
}
}

/********************************************************
Media Queries
********************************************************/
Expand Down
6 changes: 3 additions & 3 deletions geodirectory.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@
* Plugin Name: GeoDirectory
* Plugin URI: https://wpgeodirectory.com/
* Description: GeoDirectory plugin for WordPress.
* Version: 2.0.0.49
* Version: 2.0.0.50
* Author: AyeCode Ltd
* Author URI: https://wpgeodirectory.com
* Text Domain: geodirectory
* Domain Path: /languages
* Requires at least: 4.5
* Tested up to: 5.1
* Tested up to: 5.2
* Update URL: https://github.com/AyeCode/geodirectory/
*/

Expand All @@ -36,7 +36,7 @@ final class GeoDirectory {
*
* @var string
*/
public $version = '2.0.0.49';
public $version = '2.0.0.50';

/**
* GeoDirectory instance.
Expand Down
28 changes: 14 additions & 14 deletions includes/admin/admin-functions.php
Original file line number Diff line number Diff line change
Expand Up @@ -314,21 +314,21 @@ function geodir_create_page( $slug, $option, $page_title = '', $page_content = '
function geodir_admin_upgrade_notice() {
$result = get_transient( 'geodir_admin_upgrade_notice' );
if ( ! empty( $result ) ) {
return $result;
}

// readme contents
$args = array(
'timeout' => 15,
'redirection' => 5
);
$url = "http://plugins.svn.wordpress.org/geodirectory/trunk/readme.txt";
$data = wp_remote_get( $url, $args );

if ( ! is_wp_error( $data ) && $data['response']['code'] == 200 ) {
$result = $data['body'];
set_transient( 'geodir_admin_upgrade_notice', $result, HOUR_IN_SECONDS );
geodir_in_plugin_upgrade_message( $result );
}else{
// readme contents
$args = array(
'timeout' => 15,
'redirection' => 5
);
$url = "http://plugins.svn.wordpress.org/geodirectory/trunk/readme.txt";
$data = wp_remote_get( $url, $args );

if ( ! is_wp_error( $data ) && $data['response']['code'] == 200 ) {
$result = $data['body'];
set_transient( 'geodir_admin_upgrade_notice', $result, HOUR_IN_SECONDS );
geodir_in_plugin_upgrade_message( $result );
}
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -629,7 +629,7 @@ public static function address_fields($output,$result_str,$cf,$field_info){
echo geodir_help_tip( __( 'Do you want to use the user defined map zoom level from the add listing page?', 'geodirectory' ));
_e('Use user zoom level', 'geodirectory'); ?>
<input type="hidden" name="extra[show_mapzoom]" value="0" />
<input type="checkbox" name="extra[show_mapzoom]" value="1" <?php checked( $address['show_mapzoom'], 1, true );?> />
<input type="checkbox" name="extra[show_mapzoom]" value="1" <?php if(isset($address['show_mapzoom'])){checked( $address['show_mapzoom'], 1, true );}?> />
</label>
</p>

Expand Down
5 changes: 4 additions & 1 deletion includes/class-geodir-compatibility.php
Original file line number Diff line number Diff line change
Expand Up @@ -573,7 +573,10 @@ public static function genesis_content_archive( $val ) {
*/
public static function wp_easy_updates( $api_params, $_src ) {

if ( geodir_get_option( 'admin_enable_beta', 1 ) && strpos( $_src, 'wpgeodirectory.com' ) !== false ) {
//@todo until GDv1 auto-updates are retired we need to force beta checks.
$enabled = 1;// geodir_get_option( 'admin_enable_beta', 1 );

if ( $enabled && strpos( $_src, 'wpgeodirectory.com' ) !== false ) {
if ( ! empty( $api_params['update_array'] ) ) {
foreach ( $api_params['update_array'] as $key => $val ) {
$api_params['update_array'][ $key ]['beta'] = true;
Expand Down
Binary file modified languages/geodirectory-en_US.mo
Binary file not shown.
Loading

0 comments on commit 70580ec

Please sign in to comment.