|
@@ -68,7 +68,7 @@ discard block |
|
|
block discarded – undo |
|
68
|
68
|
|
|
69
|
69
|
if (!empty($args['labels'])) {
|
|
70
|
70
|
foreach ($args['labels'] as $key => $val) {
|
|
71
|
|
- $args['labels'][$key] = __($val, 'geodirectory');// allow translation
|
|
|
71
|
+ $args['labels'][$key] = __($val, 'geodirectory'); // allow translation
|
|
72
|
72
|
}
|
|
73
|
73
|
}
|
|
74
|
74
|
|
|
@@ -109,7 +109,7 @@ discard block |
|
|
block discarded – undo |
|
109
|
109
|
|
|
110
|
110
|
if (array_key_exists('rewrite', $args)) {
|
|
111
|
111
|
if (array_key_exists('slug', $args['rewrite']))
|
|
112
|
|
- $args['rewrite']['slug'] = $listing_slug;// . '/%gd_taxonomy%';
|
|
|
112
|
+ $args['rewrite']['slug'] = $listing_slug; // . '/%gd_taxonomy%';
|
|
113
|
113
|
}
|
|
114
|
114
|
|
|
115
|
115
|
$geodir_post_types = get_option('geodir_post_types');
|
|
@@ -121,7 +121,7 @@ discard block |
|
|
block discarded – undo |
|
121
|
121
|
|
|
122
|
122
|
if (array_key_exists('rewrite', $geodir_post_types[$post_type]))
|
|
123
|
123
|
if (array_key_exists('slug', $geodir_post_types[$post_type]['rewrite']))
|
|
124
|
|
- $geodir_post_types[$post_type]['rewrite']['slug'] = $listing_slug;// . '/%gd_taxonomy%';
|
|
|
124
|
+ $geodir_post_types[$post_type]['rewrite']['slug'] = $listing_slug; // . '/%gd_taxonomy%';
|
|
125
|
125
|
|
|
126
|
126
|
update_option('geodir_post_types', $geodir_post_types);
|
|
127
|
127
|
|
|
@@ -133,13 +133,13 @@ discard block |
|
|
block discarded – undo |
|
133
|
133
|
|
|
134
|
134
|
$geodir_taxonomies = get_option('geodir_taxonomies');
|
|
135
|
135
|
|
|
136
|
|
- if (array_key_exists('listing_slug', $geodir_taxonomies[$post_type . 'category'])) {
|
|
137
|
|
- $geodir_taxonomies[$post_type . 'category']['listing_slug'] = $listing_slug;
|
|
|
136
|
+ if (array_key_exists('listing_slug', $geodir_taxonomies[$post_type.'category'])) {
|
|
|
137
|
+ $geodir_taxonomies[$post_type.'category']['listing_slug'] = $listing_slug;
|
|
138
|
138
|
|
|
139
|
|
- if (array_key_exists('args', $geodir_taxonomies[$post_type . 'category']))
|
|
140
|
|
- if (array_key_exists('rewrite', $geodir_taxonomies[$post_type . 'category']['args']))
|
|
141
|
|
- if (array_key_exists('slug', $geodir_taxonomies[$post_type . 'category']['args']['rewrite']))
|
|
142
|
|
- $geodir_taxonomies[$post_type . 'category']['args']['rewrite']['slug'] = $listing_slug;
|
|
|
139
|
+ if (array_key_exists('args', $geodir_taxonomies[$post_type.'category']))
|
|
|
140
|
+ if (array_key_exists('rewrite', $geodir_taxonomies[$post_type.'category']['args']))
|
|
|
141
|
+ if (array_key_exists('slug', $geodir_taxonomies[$post_type.'category']['args']['rewrite']))
|
|
|
142
|
+ $geodir_taxonomies[$post_type.'category']['args']['rewrite']['slug'] = $listing_slug;
|
|
143
|
143
|
|
|
144
|
144
|
update_option('geodir_taxonomies', $geodir_taxonomies);
|
|
145
|
145
|
|
|
@@ -147,13 +147,13 @@ discard block |
|
|
block discarded – undo |
|
147
|
147
|
|
|
148
|
148
|
/* --- update taxonomies (tags) --- */
|
|
149
|
149
|
$geodir_taxonomies_tag = get_option('geodir_taxonomies');
|
|
150
|
|
- if (array_key_exists('listing_slug', $geodir_taxonomies_tag[$post_type . '_tags'])) {
|
|
151
|
|
- $geodir_taxonomies_tag[$post_type . '_tags']['listing_slug'] = $listing_slug . '/tags';
|
|
|
150
|
+ if (array_key_exists('listing_slug', $geodir_taxonomies_tag[$post_type.'_tags'])) {
|
|
|
151
|
+ $geodir_taxonomies_tag[$post_type.'_tags']['listing_slug'] = $listing_slug.'/tags';
|
|
152
|
152
|
|
|
153
|
|
- if (array_key_exists('args', $geodir_taxonomies_tag[$post_type . '_tags']))
|
|
154
|
|
- if (array_key_exists('rewrite', $geodir_taxonomies_tag[$post_type . '_tags']['args']))
|
|
155
|
|
- if (array_key_exists('slug', $geodir_taxonomies_tag[$post_type . '_tags']['args']['rewrite']))
|
|
156
|
|
- $geodir_taxonomies_tag[$post_type . '_tags']['args']['rewrite']['slug'] = $listing_slug . '/tags';
|
|
|
153
|
+ if (array_key_exists('args', $geodir_taxonomies_tag[$post_type.'_tags']))
|
|
|
154
|
+ if (array_key_exists('rewrite', $geodir_taxonomies_tag[$post_type.'_tags']['args']))
|
|
|
155
|
+ if (array_key_exists('slug', $geodir_taxonomies_tag[$post_type.'_tags']['args']['rewrite']))
|
|
|
156
|
+ $geodir_taxonomies_tag[$post_type.'_tags']['args']['rewrite']['slug'] = $listing_slug.'/tags';
|
|
157
|
157
|
|
|
158
|
158
|
update_option('geodir_taxonomies', $geodir_taxonomies_tag);
|
|
159
|
159
|
|
|
@@ -203,11 +203,11 @@ discard block |
|
|
block discarded – undo |
|
203
|
203
|
$listing_slug = $args['listing_slug'];
|
|
204
|
204
|
|
|
205
|
205
|
if (strpos($taxonomy, 'tags')) {
|
|
206
|
|
- $newrules[$listing_slug . '/(.+?)/page/?([0-9]{1,})/?$'] = 'index.php?' . $taxonomy . '=$matches[1]&paged=$matches[2]';
|
|
207
|
|
- $newrules[$listing_slug . '/(.+?)/?$'] = 'index.php?' . $taxonomy . '=$matches[1]';
|
|
|
206
|
+ $newrules[$listing_slug.'/(.+?)/page/?([0-9]{1,})/?$'] = 'index.php?'.$taxonomy.'=$matches[1]&paged=$matches[2]';
|
|
|
207
|
+ $newrules[$listing_slug.'/(.+?)/?$'] = 'index.php?'.$taxonomy.'=$matches[1]';
|
|
208
|
208
|
} else {
|
|
209
|
209
|
// use this loop to add paging for details page comments paging
|
|
210
|
|
- $newrules[str_replace("/tags","",$listing_slug) . '/(.+?)/comment-page-([0-9]{1,})/?$'] = 'index.php?' . $taxonomy . '=$matches[1]&cpage=$matches[2]';
|
|
|
210
|
+ $newrules[str_replace("/tags", "", $listing_slug).'/(.+?)/comment-page-([0-9]{1,})/?$'] = 'index.php?'.$taxonomy.'=$matches[1]&cpage=$matches[2]';
|
|
211
|
211
|
}
|
|
212
|
212
|
endforeach;
|
|
213
|
213
|
endif;
|
|
@@ -215,7 +215,7 @@ discard block |
|
|
block discarded – undo |
|
215
|
215
|
// create rules for location listing
|
|
216
|
216
|
$location_page = get_option('geodir_location_page');
|
|
217
|
217
|
|
|
218
|
|
- if($location_page) {
|
|
|
218
|
+ if ($location_page) {
|
|
219
|
219
|
global $wpdb;
|
|
220
|
220
|
$location_prefix = $wpdb->get_var($wpdb->prepare("SELECT post_name FROM $wpdb->posts WHERE post_type='page' AND ID=%d", $location_page));
|
|
221
|
221
|
}
|
|
@@ -245,30 +245,30 @@ discard block |
|
|
block discarded – undo |
|
245
|
245
|
|
|
246
|
246
|
if ($matches2) {
|
|
247
|
247
|
if ($neighbourhood_active) {
|
|
248
|
|
- $newrules[$location_prefix . '/([^/]+)/([^/]+)/([^/]+)/?$'] = 'index.php?page_id=' . $location_page . '&' . $matches1 . '=$matches[1]&' . $matches2 . '=$matches[2]&gd_neighbourhood=$matches[3]';
|
|
|
248
|
+ $newrules[$location_prefix.'/([^/]+)/([^/]+)/([^/]+)/?$'] = 'index.php?page_id='.$location_page.'&'.$matches1.'=$matches[1]&'.$matches2.'=$matches[2]&gd_neighbourhood=$matches[3]';
|
|
249
|
249
|
}
|
|
250
|
|
- $newrules[$location_prefix . '/([^/]+)/([^/]+)/?$'] = 'index.php?page_id=' . $location_page . '&' . $matches1 . '=$matches[1]&' . $matches2 . '=$matches[2]';
|
|
|
250
|
+ $newrules[$location_prefix.'/([^/]+)/([^/]+)/?$'] = 'index.php?page_id='.$location_page.'&'.$matches1.'=$matches[1]&'.$matches2.'=$matches[2]';
|
|
251
|
251
|
} else {
|
|
252
|
252
|
if ($neighbourhood_active) {
|
|
253
|
|
- $newrules[$location_prefix . '/([^/]+)/([^/]+)/?$'] = 'index.php?page_id=' . $location_page . '&' . $matches1 . '=$matches[1]&gd_neighbourhood=$matches[2]';
|
|
|
253
|
+ $newrules[$location_prefix.'/([^/]+)/([^/]+)/?$'] = 'index.php?page_id='.$location_page.'&'.$matches1.'=$matches[1]&gd_neighbourhood=$matches[2]';
|
|
254
|
254
|
}
|
|
255
|
255
|
}
|
|
256
|
256
|
|
|
257
|
|
- $newrules[$location_prefix . '/([^/]+)/?$'] = 'index.php?page_id=' . $location_page . '&' . $matches1 . '=$matches[1]';
|
|
|
257
|
+ $newrules[$location_prefix.'/([^/]+)/?$'] = 'index.php?page_id='.$location_page.'&'.$matches1.'=$matches[1]';
|
|
258
|
258
|
} else { // country/region/city
|
|
259
|
259
|
if ($neighbourhood_active) {
|
|
260
|
|
- $newrules[$location_prefix . '/([^/]+)/([^/]+)/([^/]+)/([^/]+)/?$'] = 'index.php?page_id=' . $location_page . '&gd_country=$matches[1]&gd_region=$matches[2]&gd_city=$matches[3]&gd_neighbourhood=$matches[4]';
|
|
|
260
|
+ $newrules[$location_prefix.'/([^/]+)/([^/]+)/([^/]+)/([^/]+)/?$'] = 'index.php?page_id='.$location_page.'&gd_country=$matches[1]&gd_region=$matches[2]&gd_city=$matches[3]&gd_neighbourhood=$matches[4]';
|
|
261
|
261
|
}
|
|
262
|
|
- $newrules[$location_prefix . '/([^/]+)/([^/]+)/([^/]+)/?$'] = 'index.php?page_id=' . $location_page . '&gd_country=$matches[1]&gd_region=$matches[2]&gd_city=$matches[3]';
|
|
263
|
|
- $newrules[$location_prefix . '/([^/]+)/([^/]+)/?$'] = 'index.php?page_id=' . $location_page . '&gd_country=$matches[1]&gd_region=$matches[2]';
|
|
264
|
|
- $newrules[$location_prefix . '/([^/]+)/?$'] = 'index.php?page_id=' . $location_page . '&gd_country=$matches[1]';
|
|
|
262
|
+ $newrules[$location_prefix.'/([^/]+)/([^/]+)/([^/]+)/?$'] = 'index.php?page_id='.$location_page.'&gd_country=$matches[1]&gd_region=$matches[2]&gd_city=$matches[3]';
|
|
|
263
|
+ $newrules[$location_prefix.'/([^/]+)/([^/]+)/?$'] = 'index.php?page_id='.$location_page.'&gd_country=$matches[1]&gd_region=$matches[2]';
|
|
|
264
|
+ $newrules[$location_prefix.'/([^/]+)/?$'] = 'index.php?page_id='.$location_page.'&gd_country=$matches[1]';
|
|
265
|
265
|
}
|
|
266
|
266
|
|
|
267
|
267
|
if ($location_page && geodir_is_wpml()) {
|
|
268
|
|
- foreach(icl_get_languages('skip_missing=N') as $lang){
|
|
|
268
|
+ foreach (icl_get_languages('skip_missing=N') as $lang) {
|
|
269
|
269
|
$alt_page_id = '';
|
|
270
|
|
- $alt_page_id = geodir_wpml_object_id($location_page, 'page', false,$lang['language_code']);
|
|
271
|
|
- if($alt_page_id){
|
|
|
270
|
+ $alt_page_id = geodir_wpml_object_id($location_page, 'page', false, $lang['language_code']);
|
|
|
271
|
+ if ($alt_page_id) {
|
|
272
|
272
|
$location_prefix = $wpdb->get_var($wpdb->prepare("SELECT post_name FROM $wpdb->posts WHERE post_type='page' AND ID=%d", $alt_page_id));
|
|
273
|
273
|
|
|
274
|
274
|
if ($location_manager && ($hide_country_part || $hide_region_part)) {
|
|
@@ -287,29 +287,29 @@ discard block |
|
|
block discarded – undo |
|
287
|
287
|
|
|
288
|
288
|
if ($matches2) {
|
|
289
|
289
|
if ($neighbourhood_active) {
|
|
290
|
|
- $newrules[$location_prefix . '/([^/]+)/([^/]+)/([^/]+)/?$'] = 'index.php?page_id=' . $alt_page_id . '&' . $matches1 . '=$matches[1]&' . $matches2 . '=$matches[2]&gd_neighbourhood=$matches[3]';
|
|
|
290
|
+ $newrules[$location_prefix.'/([^/]+)/([^/]+)/([^/]+)/?$'] = 'index.php?page_id='.$alt_page_id.'&'.$matches1.'=$matches[1]&'.$matches2.'=$matches[2]&gd_neighbourhood=$matches[3]';
|
|
291
|
291
|
}
|
|
292
|
|
- $newrules[$location_prefix . '/([^/]+)/([^/]+)/?$'] = 'index.php?page_id=' . $alt_page_id . '&' . $matches1 . '=$matches[1]&' . $matches2 . '=$matches[2]';
|
|
|
292
|
+ $newrules[$location_prefix.'/([^/]+)/([^/]+)/?$'] = 'index.php?page_id='.$alt_page_id.'&'.$matches1.'=$matches[1]&'.$matches2.'=$matches[2]';
|
|
293
|
293
|
} else {
|
|
294
|
294
|
if ($neighbourhood_active) {
|
|
295
|
|
- $newrules[$location_prefix . '/([^/]+)/([^/]+)/?$'] = 'index.php?page_id=' . $alt_page_id . '&' . $matches1 . '=$matches[1]&gd_neighbourhood=$matches[2]';
|
|
|
295
|
+ $newrules[$location_prefix.'/([^/]+)/([^/]+)/?$'] = 'index.php?page_id='.$alt_page_id.'&'.$matches1.'=$matches[1]&gd_neighbourhood=$matches[2]';
|
|
296
|
296
|
}
|
|
297
|
297
|
}
|
|
298
|
298
|
|
|
299
|
|
- $newrules[$location_prefix . '/([^/]+)/?$'] = 'index.php?page_id=' . $alt_page_id . '&' . $matches1 . '=$matches[1]';
|
|
|
299
|
+ $newrules[$location_prefix.'/([^/]+)/?$'] = 'index.php?page_id='.$alt_page_id.'&'.$matches1.'=$matches[1]';
|
|
300
|
300
|
} else { // country/region/city
|
|
301
|
301
|
if ($neighbourhood_active) {
|
|
302
|
|
- $newrules[$location_prefix . '/([^/]+)/([^/]+)/([^/]+)/([^/]+)/?$'] = 'index.php?page_id=' . $alt_page_id . '&gd_country=$matches[1]&gd_region=$matches[2]&gd_city=$matches[3]&gd_neighbourhood=$matches[4]';
|
|
|
302
|
+ $newrules[$location_prefix.'/([^/]+)/([^/]+)/([^/]+)/([^/]+)/?$'] = 'index.php?page_id='.$alt_page_id.'&gd_country=$matches[1]&gd_region=$matches[2]&gd_city=$matches[3]&gd_neighbourhood=$matches[4]';
|
|
303
|
303
|
}
|
|
304
|
|
- $newrules[$location_prefix . '/([^/]+)/([^/]+)/([^/]+)/?$'] = 'index.php?page_id=' . $alt_page_id . '&gd_country=$matches[1]&gd_region=$matches[2]&gd_city=$matches[3]';
|
|
305
|
|
- $newrules[$location_prefix . '/([^/]+)/([^/]+)/?$'] = 'index.php?page_id=' . $alt_page_id . '&gd_country=$matches[1]&gd_region=$matches[2]';
|
|
306
|
|
- $newrules[$location_prefix . '/([^/]+)/?$'] = 'index.php?page_id=' . $alt_page_id . '&gd_country=$matches[1]';
|
|
|
304
|
+ $newrules[$location_prefix.'/([^/]+)/([^/]+)/([^/]+)/?$'] = 'index.php?page_id='.$alt_page_id.'&gd_country=$matches[1]&gd_region=$matches[2]&gd_city=$matches[3]';
|
|
|
305
|
+ $newrules[$location_prefix.'/([^/]+)/([^/]+)/?$'] = 'index.php?page_id='.$alt_page_id.'&gd_country=$matches[1]&gd_region=$matches[2]';
|
|
|
306
|
+ $newrules[$location_prefix.'/([^/]+)/?$'] = 'index.php?page_id='.$alt_page_id.'&gd_country=$matches[1]';
|
|
307
|
307
|
}
|
|
308
|
308
|
}
|
|
309
|
309
|
}
|
|
310
|
310
|
}
|
|
311
|
311
|
|
|
312
|
|
- $newrules[$location_prefix . '/?$'] = 'index.php?page_id=' . $location_page;
|
|
|
312
|
+ $newrules[$location_prefix.'/?$'] = 'index.php?page_id='.$location_page;
|
|
313
|
313
|
|
|
314
|
314
|
$rules = array_merge($newrules, $rules);
|
|
315
|
315
|
return $rules;
|
|
@@ -338,7 +338,7 @@ discard block |
|
|
block discarded – undo |
|
338
|
338
|
#Redirect 301 /location/ /$location_prefix/
|
|
339
|
339
|
# END GeoDirectory Rules\n\n
|
|
340
|
340
|
EOD;
|
|
341
|
|
- return $my_content . $rules;
|
|
|
341
|
+ return $my_content.$rules;
|
|
342
|
342
|
}
|
|
343
|
343
|
//add_filter('mod_rewrite_rules', 'geodir_htaccess_contents');
|
|
344
|
344
|
|
|
@@ -414,12 +414,12 @@ discard block |
|
|
block discarded – undo |
|
414
|
414
|
global $wpdb;
|
|
415
|
415
|
|
|
416
|
416
|
$page_for_posts = get_option('page_for_posts');
|
|
417
|
|
- $real_page_id = $wpdb->get_var($wpdb->prepare("SELECT ID FROM $wpdb->posts WHERE post_type='page' AND post_name=%s",$wp->query_vars['pagename']));
|
|
|
417
|
+ $real_page_id = $wpdb->get_var($wpdb->prepare("SELECT ID FROM $wpdb->posts WHERE post_type='page' AND post_name=%s", $wp->query_vars['pagename']));
|
|
418
|
418
|
|
|
419
|
419
|
if (geodir_is_wpml()) {
|
|
420
|
420
|
$real_page_id = geodir_wpml_object_id($real_page_id, 'page', true, ICL_LANGUAGE_CODE);
|
|
421
|
421
|
}
|
|
422
|
|
- if ($real_page_id && $real_page_id!=$page_for_posts) {
|
|
|
422
|
+ if ($real_page_id && $real_page_id != $page_for_posts) {
|
|
423
|
423
|
$wp->query_vars['page_id'] = $real_page_id;
|
|
424
|
424
|
}
|
|
425
|
425
|
}
|
|
@@ -466,7 +466,7 @@ discard block |
|
|
block discarded – undo |
|
466
|
466
|
$gd_city = $default_location->city_slug;
|
|
467
|
467
|
|
|
468
|
468
|
$base_location_link = geodir_get_location_link('base');
|
|
469
|
|
- wp_redirect($base_location_link . '/' . $gd_country . '/' . $gd_region . '/' . $gd_city);
|
|
|
469
|
+ wp_redirect($base_location_link.'/'.$gd_country.'/'.$gd_region.'/'.$gd_city);
|
|
470
|
470
|
exit();
|
|
471
|
471
|
}
|
|
472
|
472
|
}
|
|
@@ -527,7 +527,7 @@ discard block |
|
|
block discarded – undo |
|
527
|
527
|
$geodir_set_location_session = true;
|
|
528
|
528
|
$geodir_taxonomis = geodir_get_taxonomies('', true);
|
|
529
|
529
|
|
|
530
|
|
- if(!empty($geodir_taxonomis)){
|
|
|
530
|
+ if (!empty($geodir_taxonomis)) {
|
|
531
|
531
|
foreach ($geodir_taxonomis as $taxonomy) {
|
|
532
|
532
|
if (array_key_exists($taxonomy, $wp->query_vars)) {
|
|
533
|
533
|
$is_geodir_taxonomy = true;
|
|
@@ -584,7 +584,7 @@ discard block |
|
|
block discarded – undo |
|
584
|
584
|
}
|
|
585
|
585
|
|
|
586
|
586
|
|
|
587
|
|
- $geodir_term = str_replace('/' . $geodir_last_term, '', $geodir_term, $post_title_replace_count);
|
|
|
587
|
+ $geodir_term = str_replace('/'.$geodir_last_term, '', $geodir_term, $post_title_replace_count);
|
|
588
|
588
|
if (!$post_title_replace_count)
|
|
589
|
589
|
$geodir_term = str_replace($geodir_last_term, '', $geodir_term, $post_title_replace_count);
|
|
590
|
590
|
$geodir_terms = explode('/', $geodir_term);
|
|
@@ -661,7 +661,7 @@ discard block |
|
|
block discarded – undo |
|
661
|
661
|
if (geodir_strtolower($default_location->country_slug) == geodir_strtolower($gd_country))
|
|
662
|
662
|
$is_geodir_location_found = true;
|
|
663
|
663
|
}
|
|
664
|
|
- } else if ($geodir_show_location_url == 'region_city') {
|
|
|
664
|
+ } else if ($geodir_show_location_url == 'region_city') {
|
|
665
|
665
|
if (count($geodir_terms) >= 2) {
|
|
666
|
666
|
$gd_region = urldecode($geodir_terms[0]);
|
|
667
|
667
|
$gd_city = urldecode($geodir_terms[1]);
|
|
@@ -720,13 +720,13 @@ discard block |
|
|
block discarded – undo |
|
720
|
720
|
$wp->query_vars[$geodir_taxonomy] = $geodir_term;
|
|
721
|
721
|
// eliminate location related terms from taxonomy term
|
|
722
|
722
|
if ($gd_country != '')
|
|
723
|
|
- $wp->query_vars[$geodir_taxonomy] = preg_replace('/' . urlencode($gd_country) . '/', '', $wp->query_vars[$geodir_taxonomy], 1);
|
|
|
723
|
+ $wp->query_vars[$geodir_taxonomy] = preg_replace('/'.urlencode($gd_country).'/', '', $wp->query_vars[$geodir_taxonomy], 1);
|
|
724
|
724
|
|
|
725
|
725
|
if ($gd_region != '')
|
|
726
|
|
- $wp->query_vars[$geodir_taxonomy] = preg_replace('/' . urlencode($gd_region) . '/', '', $wp->query_vars[$geodir_taxonomy], 1);
|
|
|
726
|
+ $wp->query_vars[$geodir_taxonomy] = preg_replace('/'.urlencode($gd_region).'/', '', $wp->query_vars[$geodir_taxonomy], 1);
|
|
727
|
727
|
|
|
728
|
728
|
if ($gd_city != '')
|
|
729
|
|
- $wp->query_vars[$geodir_taxonomy] = preg_replace('/' . urlencode($gd_city) . '/', '', $wp->query_vars[$geodir_taxonomy], 1);
|
|
|
729
|
+ $wp->query_vars[$geodir_taxonomy] = preg_replace('/'.urlencode($gd_city).'/', '', $wp->query_vars[$geodir_taxonomy], 1);
|
|
730
|
730
|
|
|
731
|
731
|
|
|
732
|
732
|
$wp->query_vars[$geodir_taxonomy] = str_replace('///', '', $wp->query_vars[$geodir_taxonomy]);
|
|
@@ -911,16 +911,16 @@ discard block |
|
|
block discarded – undo |
|
911
|
911
|
* @param string $option Option name.
|
|
912
|
912
|
* @return mixed The taxonomy option value.
|
|
913
|
913
|
*/
|
|
914
|
|
-function geodir_wpseo_taxonomy_meta( $value, $option = '' ) {
|
|
|
914
|
+function geodir_wpseo_taxonomy_meta($value, $option = '') {
|
|
915
|
915
|
global $wp_query;
|
|
916
|
916
|
|
|
917
|
|
- if ( !empty( $value ) && ( is_category() || is_tax() ) ) {
|
|
|
917
|
+ if (!empty($value) && (is_category() || is_tax())) {
|
|
918
|
918
|
$term = $wp_query->get_queried_object();
|
|
919
|
919
|
|
|
920
|
|
- if ( !empty( $term->term_id ) && !empty( $term->taxonomy ) && isset( $value[$term->taxonomy][$term->term_id] ) && in_array( str_replace( 'category', '', $term->taxonomy ), geodir_get_posttypes() ) ) {
|
|
921
|
|
- $image = geodir_get_default_catimage( $term->term_id, str_replace( 'category', '', $term->taxonomy ) );
|
|
|
920
|
+ if (!empty($term->term_id) && !empty($term->taxonomy) && isset($value[$term->taxonomy][$term->term_id]) && in_array(str_replace('category', '', $term->taxonomy), geodir_get_posttypes())) {
|
|
|
921
|
+ $image = geodir_get_default_catimage($term->term_id, str_replace('category', '', $term->taxonomy));
|
|
922
|
922
|
|
|
923
|
|
- if ( !empty( $image['src'] ) ) {
|
|
|
923
|
+ if (!empty($image['src'])) {
|
|
924
|
924
|
$value[$term->taxonomy][$term->term_id]['wpseo_twitter-image'] = $image['src'];
|
|
925
|
925
|
$value[$term->taxonomy][$term->term_id]['wpseo_opengraph-image'] = $image['src'];
|
|
926
|
926
|
}
|
|
@@ -928,7 +928,7 @@ discard block |
|
|
block discarded – undo |
|
928
|
928
|
}
|
|
929
|
929
|
return $value;
|
|
930
|
930
|
}
|
|
931
|
|
-add_filter( 'option_wpseo_taxonomy_meta', 'geodir_wpseo_taxonomy_meta', 10, 2 );
|
|
|
931
|
+add_filter('option_wpseo_taxonomy_meta', 'geodir_wpseo_taxonomy_meta', 10, 2);
|
|
932
|
932
|
|
|
933
|
933
|
/**
|
|
934
|
934
|
* Fix affiliate links for GeoDirectory CPTs listing pages.
|
|
@@ -937,24 +937,24 @@ discard block |
|
|
block discarded – undo |
|
937
|
937
|
*
|
|
938
|
938
|
*/
|
|
939
|
939
|
function geodir_affiliate_wp_rewrite_fix() {
|
|
940
|
|
- if ( !class_exists( 'Affiliate_WP' ) ) {
|
|
|
940
|
+ if (!class_exists('Affiliate_WP')) {
|
|
941
|
941
|
return;
|
|
942
|
942
|
}
|
|
943
|
943
|
|
|
944
|
|
- $gd_post_types = geodir_get_posttypes( 'array' );
|
|
|
944
|
+ $gd_post_types = geodir_get_posttypes('array');
|
|
945
|
945
|
|
|
946
|
|
- if ( !empty( $gd_post_types ) ) {
|
|
|
946
|
+ if (!empty($gd_post_types)) {
|
|
947
|
947
|
$ref = affiliate_wp()->tracking->get_referral_var();
|
|
948
|
|
- if ( empty( $ref ) ) {
|
|
|
948
|
+ if (empty($ref)) {
|
|
949
|
949
|
return;
|
|
950
|
950
|
}
|
|
951
|
951
|
|
|
952
|
|
- foreach ( $gd_post_types as $key => $post_type ) {
|
|
953
|
|
- if ( !empty( $key ) && !empty( $post_type['rewrite']['slug'] ) ) {
|
|
954
|
|
- add_rewrite_rule( $post_type['rewrite']['slug'] . '/' . $ref . '(/(.*))?/page/([0-9]{1,})/?$', 'index.php?post_type=' . $key . '&' . $ref . '=$matches[1]&paged=$matches[3]', 'top');
|
|
955
|
|
- add_rewrite_rule( $post_type['rewrite']['slug'] . '/' . $ref . '(/(.*))?/?$', 'index.php?post_type=' . $key . '&' . $ref . '=$matches[1]', 'top');
|
|
|
952
|
+ foreach ($gd_post_types as $key => $post_type) {
|
|
|
953
|
+ if (!empty($key) && !empty($post_type['rewrite']['slug'])) {
|
|
|
954
|
+ add_rewrite_rule($post_type['rewrite']['slug'].'/'.$ref.'(/(.*))?/page/([0-9]{1,})/?$', 'index.php?post_type='.$key.'&'.$ref.'=$matches[1]&paged=$matches[3]', 'top');
|
|
|
955
|
+ add_rewrite_rule($post_type['rewrite']['slug'].'/'.$ref.'(/(.*))?/?$', 'index.php?post_type='.$key.'&'.$ref.'=$matches[1]', 'top');
|
|
956
|
956
|
}
|
|
957
|
957
|
}
|
|
958
|
958
|
}
|
|
959
|
959
|
}
|
|
960
|
|
-add_action( 'init', 'geodir_affiliate_wp_rewrite_fix', 99999 );
|
|
|
960
|
+add_action('init', 'geodir_affiliate_wp_rewrite_fix', 99999);
|
GeoDirectory /
geodirectory
