|
@@ -136,7 +136,7 @@ discard block |
|
|
block discarded – undo |
136
|
136
|
/* ON TEMPLATE INCLUDE */
|
137
|
137
|
/////////////////////////
|
138
|
138
|
|
139
|
|
-add_filter('template_include', 'geodir_template_loader',9);
|
|
139
|
+add_filter('template_include', 'geodir_template_loader', 9);
|
140
|
140
|
|
141
|
141
|
/////////////////////////
|
142
|
142
|
/* CATEGORY / TAXONOMY / CUSTOM POST ACTIONS */
|
|
@@ -176,9 +176,9 @@ discard block |
|
|
block discarded – undo |
176
|
176
|
/* WP REVIEW COUNT ACTIONS */
|
177
|
177
|
////////////////////////
|
178
|
178
|
|
179
|
|
-add_action('geodir_update_postrating', 'geodir_term_review_count_force_update_single_post', 100,1);
|
|
179
|
+add_action('geodir_update_postrating', 'geodir_term_review_count_force_update_single_post', 100, 1);
|
180
|
180
|
//add_action('geodir_update_postrating', 'geodir_term_review_count_force_update', 100);
|
181
|
|
-add_action('transition_post_status', 'geodir_term_review_count_force_update', 100,3);
|
|
181
|
+add_action('transition_post_status', 'geodir_term_review_count_force_update', 100, 3);
|
182
|
182
|
//add_action('created_term', 'geodir_term_review_count_force_update', 100);
|
183
|
183
|
add_action('edited_term', 'geodir_term_review_count_force_update', 100);
|
184
|
184
|
add_action('delete_term', 'geodir_term_review_count_force_update', 100);
|
|
@@ -223,7 +223,7 @@ discard block |
|
|
block discarded – undo |
223
|
223
|
*/
|
224
|
224
|
function geodir_unset_prev_theme_nav_location($newname)
|
225
|
225
|
{
|
226
|
|
- $geodir_theme_location = get_option('geodir_theme_location_nav_' . $newname);
|
|
226
|
+ $geodir_theme_location = get_option('geodir_theme_location_nav_'.$newname);
|
227
|
227
|
if ($geodir_theme_location) {
|
228
|
228
|
update_option('geodir_theme_location_nav', $geodir_theme_location);
|
229
|
229
|
} else {
|
|
@@ -321,8 +321,8 @@ discard block |
|
|
block discarded – undo |
321
|
321
|
|
322
|
322
|
/////// GEO DIRECOTORY CUSTOM HOOKS ///
|
323
|
323
|
|
324
|
|
-add_action('geodir_before_tab_content', 'geodir_before_tab_content');// this function is in custom_functions.php and it is used to wrap detail page tab content
|
325
|
|
-add_action('geodir_after_tab_content', 'geodir_after_tab_content');// this function is in custom_functions.php and it is used to wrap detail page tab content
|
|
324
|
+add_action('geodir_before_tab_content', 'geodir_before_tab_content'); // this function is in custom_functions.php and it is used to wrap detail page tab content
|
|
325
|
+add_action('geodir_after_tab_content', 'geodir_after_tab_content'); // this function is in custom_functions.php and it is used to wrap detail page tab content
|
326
|
326
|
|
327
|
327
|
// Detail page sidebar content
|
328
|
328
|
add_action('geodir_detail_page_sidebar', 'geodir_detail_page_sidebar_content_sorting', 1);
|
|
@@ -422,8 +422,8 @@ discard block |
|
|
block discarded – undo |
422
|
422
|
do_action('geodir_after_social_sharing_buttons');
|
423
|
423
|
$content_html = ob_get_clean();
|
424
|
424
|
if (trim($content_html) != '')
|
425
|
|
- $content_html = '<div class="geodir-company_info geodir-details-sidebar-social-sharing">' . $content_html . '</div>';
|
426
|
|
- if ((int)get_option('geodir_disable_tfg_buttons_section') != 1) {
|
|
425
|
+ $content_html = '<div class="geodir-company_info geodir-details-sidebar-social-sharing">'.$content_html.'</div>';
|
|
426
|
+ if ((int) get_option('geodir_disable_tfg_buttons_section') != 1) {
|
427
|
427
|
/**
|
428
|
428
|
* Filter the geodir_social_sharing_buttons() function content.
|
429
|
429
|
*
|
|
@@ -463,12 +463,12 @@ discard block |
|
|
block discarded – undo |
463
|
463
|
$post_id = $post->ID;
|
464
|
464
|
|
465
|
465
|
if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {
|
466
|
|
- $post_id = (int)$_REQUEST['pid'];
|
|
466
|
+ $post_id = (int) $_REQUEST['pid'];
|
467
|
467
|
}
|
468
|
468
|
|
469
|
469
|
$postlink = get_permalink(geodir_add_listing_page_id());
|
470
|
470
|
$editlink = geodir_getlink($postlink, array('pid' => $post_id), false);
|
471
|
|
- echo ' <p class="edit_link"><i class="fa fa-pencil"></i> <a href="' . esc_url($editlink) . '">' . __('Edit this Post', 'geodirectory') . '</a></p>';
|
|
471
|
+ echo ' <p class="edit_link"><i class="fa fa-pencil"></i> <a href="'.esc_url($editlink).'">'.__('Edit this Post', 'geodirectory').'</a></p>';
|
472
|
472
|
}
|
473
|
473
|
}// end of if, if its a preview or not
|
474
|
474
|
/**
|
|
@@ -479,8 +479,8 @@ discard block |
|
|
block discarded – undo |
479
|
479
|
do_action('geodir_after_edit_post_link');
|
480
|
480
|
$content_html = ob_get_clean();
|
481
|
481
|
if (trim($content_html) != '')
|
482
|
|
- $content_html = '<div class="geodir-company_info geodir-details-sidebar-user-links">' . $content_html . '</div>';
|
483
|
|
- if ((int)get_option('geodir_disable_user_links_section') != 1) {
|
|
482
|
+ $content_html = '<div class="geodir-company_info geodir-details-sidebar-user-links">'.$content_html.'</div>';
|
|
483
|
+ if ((int) get_option('geodir_disable_user_links_section') != 1) {
|
484
|
484
|
/**
|
485
|
485
|
* Filter the geodir_edit_post_link() function content.
|
486
|
486
|
*
|
|
@@ -501,8 +501,8 @@ discard block |
|
|
block discarded – undo |
501
|
501
|
*/
|
502
|
502
|
function geodir_detail_page_google_analytics()
|
503
|
503
|
{
|
504
|
|
- global $post,$preview;
|
505
|
|
- if($preview){return '';}
|
|
504
|
+ global $post, $preview;
|
|
505
|
+ if ($preview) {return ''; }
|
506
|
506
|
$package_info = array();
|
507
|
507
|
$package_info = geodir_post_package_info($package_info, $post);
|
508
|
508
|
|
|
@@ -534,14 +534,14 @@ discard block |
|
|
block discarded – undo |
534
|
534
|
$hide_refresh = get_option('geodir_ga_auto_refresh');
|
535
|
535
|
|
536
|
536
|
$auto_refresh = $hide_refresh && $refresh_time && $refresh_time > 0 ? 1 : 0;
|
537
|
|
- if (get_option('geodir_ga_stats') && is_user_logged_in() && (isset($package_info->google_analytics) && $package_info->google_analytics == '1') && (get_current_user_id()==$post->post_author || current_user_can( 'manage_options' )) ) {
|
|
537
|
+ if (get_option('geodir_ga_stats') && is_user_logged_in() && (isset($package_info->google_analytics) && $package_info->google_analytics == '1') && (get_current_user_id() == $post->post_author || current_user_can('manage_options'))) {
|
538
|
538
|
$page_url = urlencode($_SERVER['REQUEST_URI']);
|
539
|
539
|
?>
|
540
|
540
|
<script type="text/javascript">
|
541
|
541
|
var gd_gaTimeOut;
|
542
|
|
- var gd_gaTime = parseInt('<?php echo $refresh_time;?>');
|
543
|
|
- var gd_gaHideRefresh = <?php echo (int)$hide_refresh;?>;
|
544
|
|
- var gd_gaAutoRefresh = <?php echo $auto_refresh;?>;
|
|
542
|
+ var gd_gaTime = parseInt('<?php echo $refresh_time; ?>');
|
|
543
|
+ var gd_gaHideRefresh = <?php echo (int) $hide_refresh; ?>;
|
|
544
|
+ var gd_gaAutoRefresh = <?php echo $auto_refresh; ?>;
|
545
|
545
|
ga_data1 = false;
|
546
|
546
|
ga_data2 = false;
|
547
|
547
|
ga_data3 = false;
|
|
@@ -682,7 +682,7 @@ discard block |
|
|
block discarded – undo |
682
|
682
|
}
|
683
|
683
|
|
684
|
684
|
function gdga_noResults() {
|
685
|
|
- jQuery('#gdga-chart-container').html('<?php _e('No results available','geodirectory');?>');
|
|
685
|
+ jQuery('#gdga-chart-container').html('<?php _e('No results available', 'geodirectory'); ?>');
|
686
|
686
|
jQuery('#gdga-legend-container').html('');
|
687
|
687
|
}
|
688
|
688
|
|
|
@@ -714,18 +714,18 @@ discard block |
|
|
block discarded – undo |
714
|
714
|
var data2 = results[1].rows.map(function(row) { return +row[2]; });
|
715
|
715
|
//var labelsN = results[0].rows.map(function(row) { return +row[1]; });
|
716
|
716
|
|
717
|
|
- var labels = ['<?php _e('Jan', 'geodirectory');?>',
|
718
|
|
- '<?php _e('Feb', 'geodirectory');?>',
|
719
|
|
- '<?php _e('Mar', 'geodirectory');?>',
|
720
|
|
- '<?php _e('Apr', 'geodirectory');?>',
|
721
|
|
- '<?php _e('May', 'geodirectory');?>',
|
722
|
|
- '<?php _e('Jun', 'geodirectory');?>',
|
723
|
|
- '<?php _e('Jul', 'geodirectory');?>',
|
724
|
|
- '<?php _e('Aug', 'geodirectory');?>',
|
725
|
|
- '<?php _e('Sep', 'geodirectory');?>',
|
726
|
|
- '<?php _e('Oct', 'geodirectory');?>',
|
727
|
|
- '<?php _e('Nov', 'geodirectory');?>',
|
728
|
|
- '<?php _e('Dec', 'geodirectory');?>'];
|
|
717
|
+ var labels = ['<?php _e('Jan', 'geodirectory'); ?>',
|
|
718
|
+ '<?php _e('Feb', 'geodirectory'); ?>',
|
|
719
|
+ '<?php _e('Mar', 'geodirectory'); ?>',
|
|
720
|
+ '<?php _e('Apr', 'geodirectory'); ?>',
|
|
721
|
+ '<?php _e('May', 'geodirectory'); ?>',
|
|
722
|
+ '<?php _e('Jun', 'geodirectory'); ?>',
|
|
723
|
+ '<?php _e('Jul', 'geodirectory'); ?>',
|
|
724
|
+ '<?php _e('Aug', 'geodirectory'); ?>',
|
|
725
|
+ '<?php _e('Sep', 'geodirectory'); ?>',
|
|
726
|
+ '<?php _e('Oct', 'geodirectory'); ?>',
|
|
727
|
+ '<?php _e('Nov', 'geodirectory'); ?>',
|
|
728
|
+ '<?php _e('Dec', 'geodirectory'); ?>'];
|
729
|
729
|
|
730
|
730
|
// Ensure the data arrays are at least as long as the labels array.
|
731
|
731
|
// Chart.js bar charts don't (yet) accept sparse datasets.
|
|
@@ -738,13 +738,13 @@ discard block |
|
|
block discarded – undo |
738
|
738
|
labels : labels,
|
739
|
739
|
datasets : [
|
740
|
740
|
{
|
741
|
|
- label: '<?php _e('Last Year', 'geodirectory');?>',
|
|
741
|
+ label: '<?php _e('Last Year', 'geodirectory'); ?>',
|
742
|
742
|
fillColor : "rgba(220,220,220,0.5)",
|
743
|
743
|
strokeColor : "rgba(220,220,220,1)",
|
744
|
744
|
data : data2
|
745
|
745
|
},
|
746
|
746
|
{
|
747
|
|
- label: '<?php _e('This Year', 'geodirectory');?>',
|
|
747
|
+ label: '<?php _e('This Year', 'geodirectory'); ?>',
|
748
|
748
|
fillColor : "rgba(151,187,205,0.5)",
|
749
|
749
|
strokeColor : "rgba(151,187,205,1)",
|
750
|
750
|
data : data1
|
|
@@ -789,30 +789,30 @@ discard block |
|
|
block discarded – undo |
789
|
789
|
|
790
|
790
|
<?php
|
791
|
791
|
// Here we list the shorthand days of the week so it can be used in translation.
|
792
|
|
- __("Mon",'geodirectory');
|
793
|
|
- __("Tue",'geodirectory');
|
794
|
|
- __("Wed",'geodirectory');
|
795
|
|
- __("Thu",'geodirectory');
|
796
|
|
- __("Fri",'geodirectory');
|
797
|
|
- __("Sat",'geodirectory');
|
798
|
|
- __("Sun",'geodirectory');
|
|
792
|
+ __("Mon", 'geodirectory');
|
|
793
|
+ __("Tue", 'geodirectory');
|
|
794
|
+ __("Wed", 'geodirectory');
|
|
795
|
+ __("Thu", 'geodirectory');
|
|
796
|
+ __("Fri", 'geodirectory');
|
|
797
|
+ __("Sat", 'geodirectory');
|
|
798
|
+ __("Sun", 'geodirectory');
|
799
|
799
|
?>
|
800
|
800
|
|
801
|
801
|
labels = [
|
802
|
|
- "<?php _e(date('D', strtotime("+1 day")),'geodirectory'); ?>",
|
803
|
|
- "<?php _e(date('D', strtotime("+2 day")),'geodirectory'); ?>",
|
804
|
|
- "<?php _e(date('D', strtotime("+3 day")),'geodirectory'); ?>",
|
805
|
|
- "<?php _e(date('D', strtotime("+4 day")),'geodirectory'); ?>",
|
806
|
|
- "<?php _e(date('D', strtotime("+5 day")),'geodirectory'); ?>",
|
807
|
|
- "<?php _e(date('D', strtotime("+6 day")),'geodirectory'); ?>",
|
808
|
|
- "<?php _e(date('D', strtotime("+7 day")),'geodirectory'); ?>"
|
|
802
|
+ "<?php _e(date('D', strtotime("+1 day")), 'geodirectory'); ?>",
|
|
803
|
+ "<?php _e(date('D', strtotime("+2 day")), 'geodirectory'); ?>",
|
|
804
|
+ "<?php _e(date('D', strtotime("+3 day")), 'geodirectory'); ?>",
|
|
805
|
+ "<?php _e(date('D', strtotime("+4 day")), 'geodirectory'); ?>",
|
|
806
|
+ "<?php _e(date('D', strtotime("+5 day")), 'geodirectory'); ?>",
|
|
807
|
+ "<?php _e(date('D', strtotime("+6 day")), 'geodirectory'); ?>",
|
|
808
|
+ "<?php _e(date('D', strtotime("+7 day")), 'geodirectory'); ?>"
|
809
|
809
|
];
|
810
|
810
|
|
811
|
811
|
var data = {
|
812
|
812
|
labels : labels,
|
813
|
813
|
datasets : [
|
814
|
814
|
{
|
815
|
|
- label: '<?php _e('Last Week', 'geodirectory');?>',
|
|
815
|
+ label: '<?php _e('Last Week', 'geodirectory'); ?>',
|
816
|
816
|
fillColor : "rgba(220,220,220,0.5)",
|
817
|
817
|
strokeColor : "rgba(220,220,220,1)",
|
818
|
818
|
pointColor : "rgba(220,220,220,1)",
|
|
@@ -820,7 +820,7 @@ discard block |
|
|
block discarded – undo |
820
|
820
|
data : data2
|
821
|
821
|
},
|
822
|
822
|
{
|
823
|
|
- label: '<?php _e('This Week', 'geodirectory');?>',
|
|
823
|
+ label: '<?php _e('This Week', 'geodirectory'); ?>',
|
824
|
824
|
fillColor : "rgba(151,187,205,0.5)",
|
825
|
825
|
strokeColor : "rgba(151,187,205,1)",
|
826
|
826
|
pointColor : "rgba(151,187,205,1)",
|
|
@@ -1027,18 +1027,18 @@ discard block |
|
|
block discarded – undo |
1027
|
1027
|
</style>
|
1028
|
1028
|
<script src="https://cdnjs.cloudflare.com/ajax/libs/Chart.js/1.0.2/Chart.min.js"></script>
|
1029
|
1029
|
<script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.10.2/moment.min.js"></script>
|
1030
|
|
- <button type="button" class="gdga-show-analytics"><?php _e('Show Google Analytics', 'geodirectory');?></button>
|
|
1030
|
+ <button type="button" class="gdga-show-analytics"><?php _e('Show Google Analytics', 'geodirectory'); ?></button>
|
1031
|
1031
|
<span id="ga_stats" class="gdga-analytics-box" style="display:none">
|
1032
|
|
- <div id="ga-analytics-title"><?php _e("Analytics", 'geodirectory');?></div>
|
|
1032
|
+ <div id="ga-analytics-title"><?php _e("Analytics", 'geodirectory'); ?></div>
|
1033
|
1033
|
<div id="gd-active-users-container">
|
1034
|
|
- <div class="gd-ActiveUsers"><i id="gdga-loader-icon" class="fa fa-refresh fa-spin" title="<?php esc_attr_e("Refresh", 'geodirectory');?>"></i><?php _e("Active Users:", 'geodirectory');?>
|
|
1034
|
+ <div class="gd-ActiveUsers"><i id="gdga-loader-icon" class="fa fa-refresh fa-spin" title="<?php esc_attr_e("Refresh", 'geodirectory'); ?>"></i><?php _e("Active Users:", 'geodirectory'); ?>
|
1035
|
1035
|
<b class="gd-ActiveUsers-value">0</b>
|
1036
|
1036
|
</div>
|
1037
|
1037
|
</div>
|
1038
|
1038
|
<select id="gdga-select-analytic" onchange="gdga_select_option();" style="display: none;">
|
1039
|
|
- <option value="weeks"><?php _e("Last Week vs This Week", 'geodirectory');?></option>
|
1040
|
|
- <option value="years"><?php _e("This Year vs Last Year", 'geodirectory');?></option>
|
1041
|
|
- <option value="country"><?php _e("Top Countries", 'geodirectory');?></option>
|
|
1039
|
+ <option value="weeks"><?php _e("Last Week vs This Week", 'geodirectory'); ?></option>
|
|
1040
|
+ <option value="years"><?php _e("This Year vs Last Year", 'geodirectory'); ?></option>
|
|
1041
|
+ <option value="country"><?php _e("Top Countries", 'geodirectory'); ?></option>
|
1042
|
1042
|
</select>
|
1043
|
1043
|
<div class="Chartjs-figure" id="gdga-chart-container"></div>
|
1044
|
1044
|
<ol class="Chartjs-legend" id="gdga-legend-container"></ol>
|
|
@@ -1054,8 +1054,8 @@ discard block |
|
|
block discarded – undo |
1054
|
1054
|
do_action('geodir_after_google_analytics');
|
1055
|
1055
|
$content_html = ob_get_clean();
|
1056
|
1056
|
if (trim($content_html) != '')
|
1057
|
|
- $content_html = '<div class="geodir-company_info geodir-details-sidebar-google-analytics">' . $content_html . '</div>';
|
1058
|
|
- if ((int)get_option('geodir_disable_google_analytics_section') != 1) {
|
|
1057
|
+ $content_html = '<div class="geodir-company_info geodir-details-sidebar-google-analytics">'.$content_html.'</div>';
|
|
1058
|
+ if ((int) get_option('geodir_disable_google_analytics_section') != 1) {
|
1059
|
1059
|
/**
|
1060
|
1060
|
* Filter the geodir_edit_post_link() function content.
|
1061
|
1061
|
*
|
|
@@ -1081,7 +1081,7 @@ discard block |
|
|
block discarded – undo |
1081
|
1081
|
{
|
1082
|
1082
|
global $post, $preview, $post_images;
|
1083
|
1083
|
|
1084
|
|
- if (!empty($post->ID) && geodir_cpt_has_rating_disabled((int)$post->ID)) {
|
|
1084
|
+ if (!empty($post->ID) && geodir_cpt_has_rating_disabled((int) $post->ID)) {
|
1085
|
1085
|
return;
|
1086
|
1086
|
}
|
1087
|
1087
|
ob_start(); // Start buffering;
|
|
@@ -1116,10 +1116,10 @@ discard block |
|
|
block discarded – undo |
1116
|
1116
|
|
1117
|
1117
|
$reviews_text = $comment_count > 1 ? __("reviews", 'geodirectory') : __("review", 'geodirectory');
|
1118
|
1118
|
|
1119
|
|
- $html .= '<span itemprop="rating" itemscope itemtype="http://data-vocabulary.org/Rating"><span class="rating" itemprop="average" content="' . $post_avgratings . '">' . $post_avgratings . '</span> / <span itemprop="best" content="5">5</span> ' . __("based on", 'geodirectory') . ' </span><span class="count" itemprop="count" content="' . $comment_count . '">' . $comment_count . ' ' . $reviews_text . '</span><br />';
|
|
1119
|
+ $html .= '<span itemprop="rating" itemscope itemtype="http://data-vocabulary.org/Rating"><span class="rating" itemprop="average" content="'.$post_avgratings.'">'.$post_avgratings.'</span> / <span itemprop="best" content="5">5</span> '.__("based on", 'geodirectory').' </span><span class="count" itemprop="count" content="'.$comment_count.'">'.$comment_count.' '.$reviews_text.'</span><br />';
|
1120
|
1120
|
|
1121
|
1121
|
$html .= '<span class="item">';
|
1122
|
|
- $html .= '<span class="fn" itemprop="itemreviewed">' . $post->post_title . '</span>';
|
|
1122
|
+ $html .= '<span class="fn" itemprop="itemreviewed">'.$post->post_title.'</span>';
|
1123
|
1123
|
|
1124
|
1124
|
if ($post_images) {
|
1125
|
1125
|
foreach ($post_images as $img) {
|
|
@@ -1129,7 +1129,7 @@ discard block |
|
|
block discarded – undo |
1129
|
1129
|
}
|
1130
|
1130
|
|
1131
|
1131
|
if (isset($post_img) && $post_img) {
|
1132
|
|
- $html .= '<br /><img src="' . $post_img . '" class="photo" alt="' . esc_attr($post->post_title) . '" itemprop="photo" content="' . $post_img . '" class="photo" />';
|
|
1132
|
+ $html .= '<br /><img src="'.$post_img.'" class="photo" alt="'.esc_attr($post->post_title).'" itemprop="photo" content="'.$post_img.'" class="photo" />';
|
1133
|
1133
|
}
|
1134
|
1134
|
|
1135
|
1135
|
$html .= '</span>';
|
|
@@ -1156,9 +1156,9 @@ discard block |
|
|
block discarded – undo |
1156
|
1156
|
do_action('geodir_after_detail_page_review_rating');
|
1157
|
1157
|
$content_html = ob_get_clean();
|
1158
|
1158
|
if (trim($content_html) != '') {
|
1159
|
|
- $content_html = '<div class="geodir-company_info geodir-details-sidebar-rating">' . $content_html . '</div>';
|
|
1159
|
+ $content_html = '<div class="geodir-company_info geodir-details-sidebar-rating">'.$content_html.'</div>';
|
1160
|
1160
|
}
|
1161
|
|
- if ((int)get_option('geodir_disable_rating_info_section') != 1) {
|
|
1161
|
+ if ((int) get_option('geodir_disable_rating_info_section') != 1) {
|
1162
|
1162
|
/**
|
1163
|
1163
|
* Filter the geodir_detail_page_review_rating() function content.
|
1164
|
1164
|
*
|
|
@@ -1197,8 +1197,8 @@ discard block |
|
|
block discarded – undo |
1197
|
1197
|
|
1198
|
1198
|
$content_html = ob_get_clean();
|
1199
|
1199
|
if (trim($content_html) != '')
|
1200
|
|
- $content_html = '<div class="geodir-company_info geodir-details-sidebar-listing-info">' . $content_html . '</div>';
|
1201
|
|
- if ((int)get_option('geodir_disable_listing_info_section') != 1) {
|
|
1200
|
+ $content_html = '<div class="geodir-company_info geodir-details-sidebar-listing-info">'.$content_html.'</div>';
|
|
1201
|
+ if ((int) get_option('geodir_disable_listing_info_section') != 1) {
|
1202
|
1202
|
/**
|
1203
|
1203
|
* Filter the output html for function geodir_detail_page_more_info().
|
1204
|
1204
|
*
|
|
@@ -1297,7 +1297,7 @@ discard block |
|
|
block discarded – undo |
1297
|
1297
|
'gd_allowed_img_types' => !empty($allowed_img_types) ? implode(',', $allowed_img_types) : '',
|
1298
|
1298
|
'geodir_txt_form_wait' => __('Wait...', 'geodirectory'),
|
1299
|
1299
|
'geodir_txt_form_searching' => __('Searching...', 'geodirectory'),
|
1300
|
|
- 'fa_rating' => (int)get_option('geodir_reviewrating_enable_font_awesome') == 1 ? 1 : '',
|
|
1300
|
+ 'fa_rating' => (int) get_option('geodir_reviewrating_enable_font_awesome') == 1 ? 1 : '',
|
1301
|
1301
|
'reviewrating' => defined('GEODIRREVIEWRATING_VERSION') ? 1 : '',
|
1302
|
1302
|
'multirating' => defined('GEODIRREVIEWRATING_VERSION') && get_option('geodir_reviewrating_enable_rating') ? true : false,
|
1303
|
1303
|
'geodir_map_name' => geodir_map_name(),
|
|
@@ -1326,10 +1326,10 @@ discard block |
|
|
block discarded – undo |
1326
|
1326
|
foreach ($arr_alert_msg as $key => $value) {
|
1327
|
1327
|
if (!is_scalar($value))
|
1328
|
1328
|
continue;
|
1329
|
|
- $arr_alert_msg[$key] = html_entity_decode((string)$value, ENT_QUOTES, 'UTF-8');
|
|
1329
|
+ $arr_alert_msg[$key] = html_entity_decode((string) $value, ENT_QUOTES, 'UTF-8');
|
1330
|
1330
|
}
|
1331
|
1331
|
|
1332
|
|
- $script = "var geodir_all_js_msg = " . json_encode($arr_alert_msg) . ';';
|
|
1332
|
+ $script = "var geodir_all_js_msg = ".json_encode($arr_alert_msg).';';
|
1333
|
1333
|
echo '<script>';
|
1334
|
1334
|
echo $script;
|
1335
|
1335
|
echo '</script>';
|
|
@@ -1419,7 +1419,7 @@ discard block |
|
|
block discarded – undo |
1419
|
1419
|
$geodir_old_sidebars = get_option('geodir_sidebars');
|
1420
|
1420
|
if (is_array($geodir_old_sidebars)) {
|
1421
|
1421
|
foreach ($geodir_old_sidebars as $key => $val) {
|
1422
|
|
- if(0 === strpos($key, 'geodir_'))// if gd widget
|
|
1422
|
+ if (0 === strpos($key, 'geodir_'))// if gd widget
|
1423
|
1423
|
{
|
1424
|
1424
|
$sidebars_widgets[$key] = $geodir_old_sidebars[$key];
|
1425
|
1425
|
}
|
|
@@ -1498,7 +1498,7 @@ discard block |
|
|
block discarded – undo |
1498
|
1498
|
global $post;
|
1499
|
1499
|
$term_condition = '';
|
1500
|
1500
|
if (isset($_REQUEST['backandedit'])) {
|
1501
|
|
- $post = (object)$gd_session->get('listing');
|
|
1501
|
+ $post = (object) $gd_session->get('listing');
|
1502
|
1502
|
$term_condition = isset($post->geodir_accept_term_condition) ? $post->geodir_accept_term_condition : '';
|
1503
|
1503
|
}
|
1504
|
1504
|
|
|
@@ -1512,7 +1512,7 @@ discard block |
|
|
block discarded – undo |
1512
|
1512
|
echo 'checked="checked"';
|
1513
|
1513
|
} ?> field_type="checkbox" name="geodir_accept_term_condition" id="geodir_accept_term_condition"
|
1514
|
1514
|
class="geodir_textfield" value="1"
|
1515
|
|
- style="display:inline-block"/><a href="<?php $terms_page = get_option('geodir_term_condition_page'); if($terms_page){ echo get_permalink($terms_page);}?>" target="_blank"><?php _e('Please accept our terms and conditions', 'geodirectory'); ?></a>
|
|
1515
|
+ style="display:inline-block"/><a href="<?php $terms_page = get_option('geodir_term_condition_page'); if ($terms_page) { echo get_permalink($terms_page); }?>" target="_blank"><?php _e('Please accept our terms and conditions', 'geodirectory'); ?></a>
|
1516
|
1516
|
</span>
|
1517
|
1517
|
</div>
|
1518
|
1518
|
<span class="geodir_message_error"><?php if (isset($required_msg)) {
|
|
@@ -1552,7 +1552,7 @@ discard block |
|
|
block discarded – undo |
1552
|
1552
|
/** This action is documented in geodirectory_template_actions.php */
|
1553
|
1553
|
$desc_limit = apply_filters('geodir_description_field_desc_limit', '');
|
1554
|
1554
|
|
1555
|
|
- if (!($desc_limit === '' || (int)$desc_limit > 0)) {
|
|
1555
|
+ if (!($desc_limit === '' || (int) $desc_limit > 0)) {
|
1556
|
1556
|
$is_display = false;
|
1557
|
1557
|
}
|
1558
|
1558
|
}
|
|
@@ -1600,16 +1600,16 @@ discard block |
|
|
block discarded – undo |
1600
|
1600
|
global $wpdb, $plugin_prefix;
|
1601
|
1601
|
|
1602
|
1602
|
// Remove unused virtual page
|
1603
|
|
- $listings_page_id = (int)get_option('geodir_listing_page');
|
|
1603
|
+ $listings_page_id = (int) get_option('geodir_listing_page');
|
1604
|
1604
|
if ($listings_page_id) {
|
1605
|
|
- $wpdb->query($wpdb->prepare("DELETE FROM " . $wpdb->posts . " WHERE ID=%d AND post_name = %s AND post_type=%s", array($listings_page_id, 'listings', 'page')));
|
|
1605
|
+ $wpdb->query($wpdb->prepare("DELETE FROM ".$wpdb->posts." WHERE ID=%d AND post_name = %s AND post_type=%s", array($listings_page_id, 'listings', 'page')));
|
1606
|
1606
|
delete_option('geodir_listing_page');
|
1607
|
1607
|
}
|
1608
|
1608
|
|
1609
|
1609
|
if (!get_option('geodir_changes_in_custom_fields_table')) {
|
1610
|
1610
|
$wpdb->query(
|
1611
|
1611
|
$wpdb->prepare(
|
1612
|
|
- "UPDATE " . GEODIR_CUSTOM_FIELDS_TABLE . " SET is_default=%s, is_admin=%s WHERE is_default=%s",
|
|
1612
|
+ "UPDATE ".GEODIR_CUSTOM_FIELDS_TABLE." SET is_default=%s, is_admin=%s WHERE is_default=%s",
|
1613
|
1613
|
array('1', '1', 'admin')
|
1614
|
1614
|
)
|
1615
|
1615
|
);
|
|
@@ -1617,9 +1617,9 @@ discard block |
|
|
block discarded – undo |
1617
|
1617
|
|
1618
|
1618
|
/* --- terms meta value set --- */
|
1619
|
1619
|
|
1620
|
|
- update_option('geodir_default_marker_icon', geodir_plugin_url() . '/geodirectory-functions/map-functions/icons/pin.png');
|
|
1620
|
+ update_option('geodir_default_marker_icon', geodir_plugin_url().'/geodirectory-functions/map-functions/icons/pin.png');
|
1621
|
1621
|
|
1622
|
|
- $options_data = $wpdb->get_results($wpdb->prepare("SELECT * FROM " . $wpdb->prefix . "options WHERE option_name LIKE %s", array('%tax_meta_%')));
|
|
1622
|
+ $options_data = $wpdb->get_results($wpdb->prepare("SELECT * FROM ".$wpdb->prefix."options WHERE option_name LIKE %s", array('%tax_meta_%')));
|
1623
|
1623
|
|
1624
|
1624
|
if (!empty($options_data)) {
|
1625
|
1625
|
|
|
@@ -1627,7 +1627,7 @@ discard block |
|
|
block discarded – undo |
1627
|
1627
|
|
1628
|
1628
|
$option_val = str_replace('tax_meta_', '', $optobj->option_name);
|
1629
|
1629
|
|
1630
|
|
- $taxonomies_data = $wpdb->get_results($wpdb->prepare("SELECT taxonomy FROM " . $wpdb->prefix . "term_taxonomy WHERE taxonomy LIKE %s AND term_id=%d", array('%category%', $option_val)));
|
|
1630
|
+ $taxonomies_data = $wpdb->get_results($wpdb->prepare("SELECT taxonomy FROM ".$wpdb->prefix."term_taxonomy WHERE taxonomy LIKE %s AND term_id=%d", array('%category%', $option_val)));
|
1631
|
1631
|
|
1632
|
1632
|
if (!empty($taxonomies_data)) {
|
1633
|
1633
|
|
|
@@ -1636,17 +1636,17 @@ discard block |
|
|
block discarded – undo |
1636
|
1636
|
$taxObject = get_taxonomy($taxobj->taxonomy);
|
1637
|
1637
|
$post_type = $taxObject->object_type[0];
|
1638
|
1638
|
|
1639
|
|
- $opt_value = 'tax_meta_' . $post_type . '_' . $option_val;
|
|
1639
|
+ $opt_value = 'tax_meta_'.$post_type.'_'.$option_val;
|
1640
|
1640
|
|
1641
|
|
- $duplicate_data = $wpdb->get_var($wpdb->prepare("SELECT option_id FROM " . $wpdb->prefix . "options WHERE option_name=%s", array('tax_meta_' . $option_val)));
|
|
1641
|
+ $duplicate_data = $wpdb->get_var($wpdb->prepare("SELECT option_id FROM ".$wpdb->prefix."options WHERE option_name=%s", array('tax_meta_'.$option_val)));
|
1642
|
1642
|
|
1643
|
1643
|
if ($duplicate_data) {
|
1644
|
1644
|
|
1645
|
|
- $wpdb->query($wpdb->prepare("UPDATE " . $wpdb->prefix . "options SET option_name=%s WHERE option_id=%d", array($opt_value, $optobj->option_id)));
|
|
1645
|
+ $wpdb->query($wpdb->prepare("UPDATE ".$wpdb->prefix."options SET option_name=%s WHERE option_id=%d", array($opt_value, $optobj->option_id)));
|
1646
|
1646
|
|
1647
|
1647
|
} else {
|
1648
|
1648
|
|
1649
|
|
- $wpdb->query($wpdb->prepare("INSERT INTO " . $wpdb->prefix . "options (option_name,option_value,autoload) VALUES (%s, %s, %s)", array($opt_value, $optobj->option_value, $optobj->autoload)));
|
|
1649
|
+ $wpdb->query($wpdb->prepare("INSERT INTO ".$wpdb->prefix."options (option_name,option_value,autoload) VALUES (%s, %s, %s)", array($opt_value, $optobj->option_value, $optobj->autoload)));
|
1650
|
1650
|
|
1651
|
1651
|
}
|
1652
|
1652
|
|
|
@@ -1680,14 +1680,14 @@ discard block |
|
|
block discarded – undo |
1680
|
1680
|
|
1681
|
1681
|
global $wpdb, $table_prefix;
|
1682
|
1682
|
|
1683
|
|
- $slug_exists = $wpdb->get_var($wpdb->prepare("SELECT slug FROM " . $table_prefix . "terms WHERE slug=%s", array($slug)));
|
|
1683
|
+ $slug_exists = $wpdb->get_var($wpdb->prepare("SELECT slug FROM ".$table_prefix."terms WHERE slug=%s", array($slug)));
|
1684
|
1684
|
|
1685
|
1685
|
if ($slug_exists) {
|
1686
|
1686
|
|
1687
|
1687
|
$suffix = 1;
|
1688
|
1688
|
do {
|
1689
|
|
- $alt_location_name = _truncate_post_slug($slug, 200 - (strlen($suffix) + 1)) . "-$suffix";
|
1690
|
|
- $location_slug_check = $wpdb->get_var($wpdb->prepare("SELECT slug FROM " . $table_prefix . "terms WHERE slug=%s", array($alt_location_name)));
|
|
1689
|
+ $alt_location_name = _truncate_post_slug($slug, 200 - (strlen($suffix) + 1))."-$suffix";
|
|
1690
|
+ $location_slug_check = $wpdb->get_var($wpdb->prepare("SELECT slug FROM ".$table_prefix."terms WHERE slug=%s", array($alt_location_name)));
|
1691
|
1691
|
$suffix++;
|
1692
|
1692
|
} while ($location_slug_check && $suffix < 100);
|
1693
|
1693
|
|
|
@@ -1741,7 +1741,7 @@ discard block |
|
|
block discarded – undo |
1741
|
1741
|
|
1742
|
1742
|
$suffix = 1;
|
1743
|
1743
|
do {
|
1744
|
|
- $new_slug = _truncate_post_slug($slug, 200 - (strlen($suffix) + 1)) . "-$suffix";
|
|
1744
|
+ $new_slug = _truncate_post_slug($slug, 200 - (strlen($suffix) + 1))."-$suffix";
|
1745
|
1745
|
|
1746
|
1746
|
/** This action is documented in geodirectory_hooks_actions.php */
|
1747
|
1747
|
$term_slug_check = apply_filters('geodir_term_slug_is_exists', false, $new_slug, $term_id);
|
|
@@ -1753,7 +1753,7 @@ discard block |
|
|
block discarded – undo |
1753
|
1753
|
|
1754
|
1754
|
//wp_update_term( $term_id, $taxonomy, array('slug' => $slug) );
|
1755
|
1755
|
|
1756
|
|
- $wpdb->query($wpdb->prepare("UPDATE " . $table_prefix . "terms SET slug=%s WHERE term_id=%d", array($slug, $term_id)));
|
|
1756
|
+ $wpdb->query($wpdb->prepare("UPDATE ".$table_prefix."terms SET slug=%s WHERE term_id=%d", array($slug, $term_id)));
|
1757
|
1757
|
|
1758
|
1758
|
}
|
1759
|
1759
|
|
|
@@ -1762,18 +1762,18 @@ discard block |
|
|
block discarded – undo |
1762
|
1762
|
$post_type = !empty($taxonomy_obj) ? $taxonomy_obj->object_type[0] : NULL;
|
1763
|
1763
|
|
1764
|
1764
|
$post_types = geodir_get_posttypes();
|
1765
|
|
- if ($post_type && in_array($post_type, $post_types) && $post_type . '_tags' == $taxonomy) {
|
1766
|
|
- $posts_obj = $wpdb->get_results($wpdb->prepare("SELECT object_id FROM " . $wpdb->term_relationships . " WHERE term_taxonomy_id = %d", array($tt_id)));
|
|
1765
|
+ if ($post_type && in_array($post_type, $post_types) && $post_type.'_tags' == $taxonomy) {
|
|
1766
|
+ $posts_obj = $wpdb->get_results($wpdb->prepare("SELECT object_id FROM ".$wpdb->term_relationships." WHERE term_taxonomy_id = %d", array($tt_id)));
|
1767
|
1767
|
|
1768
|
1768
|
if (!empty($posts_obj)) {
|
1769
|
1769
|
foreach ($posts_obj as $post_obj) {
|
1770
|
1770
|
$post_id = $post_obj->object_id;
|
1771
|
1771
|
|
1772
|
|
- $raw_tags = wp_get_object_terms($post_id, $post_type . '_tags', array('fields' => 'names'));
|
|
1772
|
+ $raw_tags = wp_get_object_terms($post_id, $post_type.'_tags', array('fields' => 'names'));
|
1773
|
1773
|
$post_tags = !empty($raw_tags) ? implode(',', $raw_tags) : '';
|
1774
|
1774
|
|
1775
|
|
- $listing_table = $plugin_prefix . $post_type . '_detail';
|
1776
|
|
- $wpdb->query($wpdb->prepare("UPDATE " . $listing_table . " SET post_tags=%s WHERE post_id =%d", array($post_tags, $post_id)));
|
|
1775
|
+ $listing_table = $plugin_prefix.$post_type.'_detail';
|
|
1776
|
+ $wpdb->query($wpdb->prepare("UPDATE ".$listing_table." SET post_tags=%s WHERE post_id =%d", array($post_tags, $post_id)));
|
1777
|
1777
|
}
|
1778
|
1778
|
}
|
1779
|
1779
|
}
|
|
@@ -1807,7 +1807,7 @@ discard block |
|
|
block discarded – undo |
1807
|
1807
|
if ($country_slug == $slug || $region_slug == $slug || $city_slug == $slug)
|
1808
|
1808
|
return $slug_exists = true;
|
1809
|
1809
|
|
1810
|
|
- if ($wpdb->get_var($wpdb->prepare("SELECT slug FROM " . $table_prefix . "terms WHERE slug=%s AND term_id != %d", array($slug, $term_id))))
|
|
1810
|
+ if ($wpdb->get_var($wpdb->prepare("SELECT slug FROM ".$table_prefix."terms WHERE slug=%s AND term_id != %d", array($slug, $term_id))))
|
1811
|
1811
|
return $slug_exists = true;
|
1812
|
1812
|
|
1813
|
1813
|
return $slug_exists;
|
|
@@ -1848,43 +1848,43 @@ discard block |
|
|
block discarded – undo |
1848
|
1848
|
|
1849
|
1849
|
|
1850
|
1850
|
$gd_page = '';
|
1851
|
|
- if(geodir_is_page('home')){
|
|
1851
|
+ if (geodir_is_page('home')) {
|
1852
|
1852
|
$gd_page = 'home';
|
1853
|
1853
|
$title = (get_option('geodir_meta_title_homepage')) ? get_option('geodir_meta_title_homepage') : $title;
|
1854
|
1854
|
}
|
1855
|
|
- elseif(geodir_is_page('detail')){
|
|
1855
|
+ elseif (geodir_is_page('detail')) {
|
1856
|
1856
|
$gd_page = 'detail';
|
1857
|
1857
|
$title = (get_option('geodir_meta_title_detail')) ? get_option('geodir_meta_title_detail') : $title;
|
1858
|
1858
|
}
|
1859
|
|
- elseif(geodir_is_page('pt')){
|
|
1859
|
+ elseif (geodir_is_page('pt')) {
|
1860
|
1860
|
$gd_page = 'pt';
|
1861
|
1861
|
$title = (get_option('geodir_meta_title_pt')) ? get_option('geodir_meta_title_pt') : $title;
|
1862
|
1862
|
}
|
1863
|
|
- elseif(geodir_is_page('listing')){
|
|
1863
|
+ elseif (geodir_is_page('listing')) {
|
1864
|
1864
|
$gd_page = 'listing';
|
1865
|
1865
|
$title = (get_option('geodir_meta_title_listing')) ? get_option('geodir_meta_title_listing') : $title;
|
1866
|
1866
|
}
|
1867
|
|
- elseif(geodir_is_page('location')){
|
|
1867
|
+ elseif (geodir_is_page('location')) {
|
1868
|
1868
|
$gd_page = 'location';
|
1869
|
1869
|
$title = (get_option('geodir_meta_title_location')) ? get_option('geodir_meta_title_location') : $title;
|
1870
|
1870
|
}
|
1871
|
|
- elseif(geodir_is_page('search')){
|
|
1871
|
+ elseif (geodir_is_page('search')) {
|
1872
|
1872
|
$gd_page = 'search';
|
1873
|
1873
|
$title = (get_option('geodir_meta_title_search')) ? get_option('geodir_meta_title_search') : $title;
|
1874
|
1874
|
}
|
1875
|
|
- elseif(geodir_is_page('add-listing')){
|
|
1875
|
+ elseif (geodir_is_page('add-listing')) {
|
1876
|
1876
|
$gd_page = 'add-listing';
|
1877
|
1877
|
$title = (get_option('geodir_meta_title_add-listing')) ? get_option('geodir_meta_title_add-listing') : $title;
|
1878
|
1878
|
}
|
1879
|
|
- elseif(geodir_is_page('author')){
|
|
1879
|
+ elseif (geodir_is_page('author')) {
|
1880
|
1880
|
$gd_page = 'author';
|
1881
|
1881
|
$title = (get_option('geodir_meta_title_author')) ? get_option('geodir_meta_title_author') : $title;
|
1882
|
1882
|
}
|
1883
|
|
- elseif(geodir_is_page('login')){
|
|
1883
|
+ elseif (geodir_is_page('login')) {
|
1884
|
1884
|
$gd_page = 'login';
|
1885
|
1885
|
$title = (get_option('geodir_meta_title_login')) ? get_option('geodir_meta_title_login') : $title;
|
1886
|
1886
|
}
|
1887
|
|
- elseif(geodir_is_page('listing-success')){
|
|
1887
|
+ elseif (geodir_is_page('listing-success')) {
|
1888
|
1888
|
$gd_page = 'listing-success';
|
1889
|
1889
|
$title = (get_option('geodir_meta_title_listing-success')) ? get_option('geodir_meta_title_listing-success') : $title;
|
1890
|
1890
|
}
|
|
@@ -1916,12 +1916,12 @@ discard block |
|
|
block discarded – undo |
1916
|
1916
|
|
1917
|
1917
|
if (!get_option('geodir_set_post_attachments')) {
|
1918
|
1918
|
|
1919
|
|
- require_once(ABSPATH . 'wp-admin/includes/image.php');
|
1920
|
|
- require_once(ABSPATH . 'wp-admin/includes/file.php');
|
|
1919
|
+ require_once(ABSPATH.'wp-admin/includes/image.php');
|
|
1920
|
+ require_once(ABSPATH.'wp-admin/includes/file.php');
|
1921
|
1921
|
|
1922
|
1922
|
$all_postypes = geodir_get_posttypes();
|
1923
|
1923
|
|
1924
|
|
- foreach($all_postypes as $post_type){
|
|
1924
|
+ foreach ($all_postypes as $post_type) {
|
1925
|
1925
|
$args = array(
|
1926
|
1926
|
'posts_per_page' => -1,
|
1927
|
1927
|
'post_type' => $post_type,
|
|
@@ -2015,7 +2015,7 @@ discard block |
|
|
block discarded – undo |
2015
|
2015
|
{
|
2016
|
2016
|
$user_id = get_current_user_id();
|
2017
|
2017
|
|
2018
|
|
- if(!$user_id){return $post;}
|
|
2018
|
+ if (!$user_id) {return $post; }
|
2019
|
2019
|
|
2020
|
2020
|
$gd_post_types = geodir_get_posttypes();
|
2021
|
2021
|
|
|
@@ -2124,7 +2124,7 @@ discard block |
|
|
block discarded – undo |
2124
|
2124
|
|
2125
|
2125
|
if (array_key_exists('post_video', $tabs_arr)) {
|
2126
|
2126
|
|
2127
|
|
- $field_title = $wpdb->get_var($wpdb->prepare("select site_title from " . GEODIR_CUSTOM_FIELDS_TABLE . " where htmlvar_name = %s and post_type = %s ", array('geodir_video', $post_type)));
|
|
2127
|
+ $field_title = $wpdb->get_var($wpdb->prepare("select site_title from ".GEODIR_CUSTOM_FIELDS_TABLE." where htmlvar_name = %s and post_type = %s ", array('geodir_video', $post_type)));
|
2128
|
2128
|
|
2129
|
2129
|
if (isset($tabs_arr['post_video']['heading_text']) && $field_title != '')
|
2130
|
2130
|
$tabs_arr['post_video']['heading_text'] = $field_title;
|
|
@@ -2132,7 +2132,7 @@ discard block |
|
|
block discarded – undo |
2132
|
2132
|
|
2133
|
2133
|
if (array_key_exists('special_offers', $tabs_arr)) {
|
2134
|
2134
|
|
2135
|
|
- $field_title = $wpdb->get_var($wpdb->prepare("select site_title from " . GEODIR_CUSTOM_FIELDS_TABLE . " where htmlvar_name = %s and post_type = %s ", array('geodir_special_offers', $post_type)));
|
|
2135
|
+ $field_title = $wpdb->get_var($wpdb->prepare("select site_title from ".GEODIR_CUSTOM_FIELDS_TABLE." where htmlvar_name = %s and post_type = %s ", array('geodir_special_offers', $post_type)));
|
2136
|
2136
|
|
2137
|
2137
|
if (isset($tabs_arr['special_offers']['heading_text']) && $field_title != '')
|
2138
|
2138
|
$tabs_arr['special_offers']['heading_text'] = $field_title;
|
|
@@ -2153,7 +2153,7 @@ discard block |
|
|
block discarded – undo |
2153
|
2153
|
*/
|
2154
|
2154
|
function geodir_remove_template_redirect_actions()
|
2155
|
2155
|
{
|
2156
|
|
- if (geodir_is_page('login')){
|
|
2156
|
+ if (geodir_is_page('login')) {
|
2157
|
2157
|
remove_all_actions('template_redirect');
|
2158
|
2158
|
remove_action('init', 'avia_modify_front', 10);
|
2159
|
2159
|
}
|
|
@@ -2200,25 +2200,25 @@ discard block |
|
|
block discarded – undo |
2200
|
2200
|
$split_img_file_path = isset($split_img_path[1]) ? $split_img_path[1] : '';
|
2201
|
2201
|
|
2202
|
2202
|
$wpdb->query(
|
2203
|
|
- $wpdb->prepare("DELETE FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id = %d AND file=%s ",
|
|
2203
|
+ $wpdb->prepare("DELETE FROM ".GEODIR_ATTACHMENT_TABLE." WHERE post_id = %d AND file=%s ",
|
2204
|
2204
|
array($post_id, $split_img_file_path)
|
2205
|
2205
|
)
|
2206
|
2206
|
);
|
2207
|
2207
|
|
2208
|
2208
|
$attachment_data = $wpdb->get_row(
|
2209
|
|
- $wpdb->prepare("SELECT ID, MIN(`menu_order`) FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id=%d",
|
|
2209
|
+ $wpdb->prepare("SELECT ID, MIN(`menu_order`) FROM ".GEODIR_ATTACHMENT_TABLE." WHERE post_id=%d",
|
2210
|
2210
|
array($post_id)
|
2211
|
2211
|
)
|
2212
|
2212
|
);
|
2213
|
2213
|
|
2214
|
2214
|
if (!empty($attachment_data)) {
|
2215
|
|
- $wpdb->query("UPDATE " . GEODIR_ATTACHMENT_TABLE . " SET menu_order=1 WHERE ID=" . $attachment_data->ID);
|
|
2215
|
+ $wpdb->query("UPDATE ".GEODIR_ATTACHMENT_TABLE." SET menu_order=1 WHERE ID=".$attachment_data->ID);
|
2216
|
2216
|
}
|
2217
|
2217
|
|
2218
|
2218
|
|
2219
|
|
- $table_name = $plugin_prefix . $post_type . '_detail';
|
|
2219
|
+ $table_name = $plugin_prefix.$post_type.'_detail';
|
2220
|
2220
|
|
2221
|
|
- $wpdb->query("UPDATE " . $table_name . " SET featured_image='' WHERE post_id =" . $post_id);
|
|
2221
|
+ $wpdb->query("UPDATE ".$table_name." SET featured_image='' WHERE post_id =".$post_id);
|
2222
|
2222
|
|
2223
|
2223
|
geodir_set_wp_featured_image($post_id);
|
2224
|
2224
|
|
|
@@ -2246,9 +2246,9 @@ discard block |
|
|
block discarded – undo |
2246
|
2246
|
|
2247
|
2247
|
foreach ($all_postypes as $posttype) {
|
2248
|
2248
|
|
2249
|
|
- $tablename = $plugin_prefix . $posttype . '_detail';
|
|
2249
|
+ $tablename = $plugin_prefix.$posttype.'_detail';
|
2250
|
2250
|
|
2251
|
|
- $get_post_data = $wpdb->get_results("SELECT post_id FROM " . $tablename);
|
|
2251
|
+ $get_post_data = $wpdb->get_results("SELECT post_id FROM ".$tablename);
|
2252
|
2252
|
|
2253
|
2253
|
if (!empty($get_post_data)) {
|
2254
|
2254
|
|
|
@@ -2256,7 +2256,7 @@ discard block |
|
|
block discarded – undo |
2256
|
2256
|
|
2257
|
2257
|
$post_id = $data->post_id;
|
2258
|
2258
|
|
2259
|
|
- $attachment_data = $wpdb->get_results("SELECT * FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id =" . $post_id . " AND file!=''");
|
|
2259
|
+ $attachment_data = $wpdb->get_results("SELECT * FROM ".GEODIR_ATTACHMENT_TABLE." WHERE post_id =".$post_id." AND file!=''");
|
2260
|
2260
|
|
2261
|
2261
|
if (!empty($attachment_data)) {
|
2262
|
2262
|
|
|
@@ -2273,22 +2273,22 @@ discard block |
|
|
block discarded – undo |
2273
|
2273
|
|
2274
|
2274
|
$file_name = $file_info['basename'];
|
2275
|
2275
|
|
2276
|
|
- $img_arr['path'] = $uploads_path . $sub_dir . '/' . $file_name;
|
|
2276
|
+ $img_arr['path'] = $uploads_path.$sub_dir.'/'.$file_name;
|
2277
|
2277
|
|
2278
|
2278
|
if (!file_exists($img_arr['path'])) {
|
2279
|
2279
|
|
2280
|
|
- $wpdb->query("DELETE FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE ID=" . $attach->ID);
|
|
2280
|
+ $wpdb->query("DELETE FROM ".GEODIR_ATTACHMENT_TABLE." WHERE ID=".$attach->ID);
|
2281
|
2281
|
|
2282
|
2282
|
}
|
2283
|
2283
|
|
2284
|
2284
|
}
|
2285
|
2285
|
|
2286
|
|
- $attachment_data = $wpdb->get_row("SELECT ID, MIN(`menu_order`) FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id=" . $post_id . " GROUP BY post_id");
|
|
2286
|
+ $attachment_data = $wpdb->get_row("SELECT ID, MIN(`menu_order`) FROM ".GEODIR_ATTACHMENT_TABLE." WHERE post_id=".$post_id." GROUP BY post_id");
|
2287
|
2287
|
|
2288
|
2288
|
if (!empty($attachment_data)) {
|
2289
|
2289
|
|
2290
|
2290
|
if ($attachment_data->ID)
|
2291
|
|
- $wpdb->query("UPDATE " . GEODIR_ATTACHMENT_TABLE . " SET menu_order=1 WHERE ID=" . $attachment_data->ID);
|
|
2291
|
+ $wpdb->query("UPDATE ".GEODIR_ATTACHMENT_TABLE." SET menu_order=1 WHERE ID=".$attachment_data->ID);
|
2292
|
2292
|
|
2293
|
2293
|
} else {
|
2294
|
2294
|
|
|
@@ -2302,7 +2302,7 @@ discard block |
|
|
block discarded – undo |
2302
|
2302
|
|
2303
|
2303
|
}
|
2304
|
2304
|
|
2305
|
|
- $wpdb->query("UPDATE " . $tablename . " SET featured_image='' WHERE post_id =" . $post_id);
|
|
2305
|
+ $wpdb->query("UPDATE ".$tablename." SET featured_image='' WHERE post_id =".$post_id);
|
2306
|
2306
|
|
2307
|
2307
|
geodir_set_wp_featured_image($post_id);
|
2308
|
2308
|
|
|
@@ -2331,7 +2331,7 @@ discard block |
|
|
block discarded – undo |
2331
|
2331
|
{
|
2332
|
2332
|
|
2333
|
2333
|
if (!get_option('geodir_default_rating_star_icon')) {
|
2334
|
|
- update_option('geodir_default_rating_star_icon', geodir_plugin_url() . '/geodirectory-assets/images/stars.png');
|
|
2334
|
+ update_option('geodir_default_rating_star_icon', geodir_plugin_url().'/geodirectory-assets/images/stars.png');
|
2335
|
2335
|
}
|
2336
|
2336
|
|
2337
|
2337
|
}
|
|
@@ -2348,10 +2348,10 @@ discard block |
|
|
block discarded – undo |
2348
|
2348
|
* @global string $plugin_prefix Geodirectory plugin table prefix.
|
2349
|
2349
|
* @return array User listing count for each post type.
|
2350
|
2350
|
*/
|
2351
|
|
-function geodir_user_post_listing_count($user_id=null)
|
|
2351
|
+function geodir_user_post_listing_count($user_id = null)
|
2352
|
2352
|
{
|
2353
|
2353
|
global $wpdb, $plugin_prefix, $current_user;
|
2354
|
|
- if(!$user_id){
|
|
2354
|
+ if (!$user_id) {
|
2355
|
2355
|
$user_id = $current_user->ID;
|
2356
|
2356
|
}
|
2357
|
2357
|
|
|
@@ -2362,7 +2362,7 @@ discard block |
|
|
block discarded – undo |
2362
|
2362
|
$user_listing = array();
|
2363
|
2363
|
if (is_array($all_posts) && !empty($all_posts)) {
|
2364
|
2364
|
foreach ($all_posts as $ptype) {
|
2365
|
|
- $total_posts = $wpdb->get_var("SELECT count( ID ) FROM " . $wpdb->prefix . "posts WHERE post_author=" . $user_id . " AND post_type='" . $ptype . "' AND ( post_status = 'publish' OR post_status = 'draft' OR post_status = 'private' )");
|
|
2365
|
+ $total_posts = $wpdb->get_var("SELECT count( ID ) FROM ".$wpdb->prefix."posts WHERE post_author=".$user_id." AND post_type='".$ptype."' AND ( post_status = 'publish' OR post_status = 'draft' OR post_status = 'private' )");
|
2366
|
2366
|
|
2367
|
2367
|
if ($total_posts > 0) {
|
2368
|
2368
|
$user_listing[$ptype] = $total_posts;
|
|
@@ -2403,19 +2403,19 @@ discard block |
|
|
block discarded – undo |
2403
|
2403
|
|
2404
|
2404
|
$custom_fields = geodir_post_custom_fields($post_package_id, 'all', $post_type, $fields_location);
|
2405
|
2405
|
//remove video and special offers if it is already set to show
|
2406
|
|
- if(isset($tabs_arr['post_video']['is_display']) && $tabs_arr['post_video']['is_display']){
|
|
2406
|
+ if (isset($tabs_arr['post_video']['is_display']) && $tabs_arr['post_video']['is_display']) {
|
2407
|
2407
|
$unset_video = true;
|
2408
|
2408
|
}
|
2409
|
2409
|
|
2410
|
|
- if(isset($tabs_arr['special_offers']['is_display']) && $tabs_arr['special_offers']['is_display']){
|
|
2410
|
+ if (isset($tabs_arr['special_offers']['is_display']) && $tabs_arr['special_offers']['is_display']) {
|
2411
|
2411
|
$unset_special_offers = true;
|
2412
|
2412
|
}
|
2413
|
|
- if(isset($unset_video) || isset($unset_special_offers) && !empty($custom_fields)){
|
2414
|
|
- foreach($custom_fields as $key => $custom_field){
|
2415
|
|
- if($custom_field['name']=='geodir_video' && isset($unset_video)){
|
|
2413
|
+ if (isset($unset_video) || isset($unset_special_offers) && !empty($custom_fields)) {
|
|
2414
|
+ foreach ($custom_fields as $key => $custom_field) {
|
|
2415
|
+ if ($custom_field['name'] == 'geodir_video' && isset($unset_video)) {
|
2416
|
2416
|
unset($custom_fields[$key]);
|
2417
|
2417
|
}
|
2418
|
|
- if($custom_field['name']=='geodir_special_offers' && isset($unset_special_offers)){
|
|
2418
|
+ if ($custom_field['name'] == 'geodir_special_offers' && isset($unset_special_offers)) {
|
2419
|
2419
|
unset($custom_fields[$key]);
|
2420
|
2420
|
}
|
2421
|
2421
|
}
|
|
@@ -2432,7 +2432,7 @@ discard block |
|
|
block discarded – undo |
2432
|
2432
|
$post->{$field_name} = $_REQUEST[$field_name];
|
2433
|
2433
|
}
|
2434
|
2434
|
|
2435
|
|
- if (isset($field['show_in']) && strpos($field['show_in'], '[owntab]') !== false && ((isset($post->{$field_name}) && $post->{$field_name} != '') || $field['type'] == 'fieldset' || $field['type'] == 'address') && in_array($field['type'], array('text', 'datepicker', 'textarea', 'time', 'phone', 'email', 'select', 'multiselect', 'url', 'html', 'fieldset', 'radio', 'checkbox', 'file','address','taxonomy'))) {
|
|
2435
|
+ if (isset($field['show_in']) && strpos($field['show_in'], '[owntab]') !== false && ((isset($post->{$field_name}) && $post->{$field_name} != '') || $field['type'] == 'fieldset' || $field['type'] == 'address') && in_array($field['type'], array('text', 'datepicker', 'textarea', 'time', 'phone', 'email', 'select', 'multiselect', 'url', 'html', 'fieldset', 'radio', 'checkbox', 'file', 'address', 'taxonomy'))) {
|
2436
|
2436
|
if ($type['type'] == 'datepicker' && ($post->{$type['htmlvar_name']} == '' || $post->{$type['htmlvar_name']} == '0000-00-00')) {
|
2437
|
2437
|
continue;
|
2438
|
2438
|
}
|
|
@@ -2465,7 +2465,7 @@ discard block |
|
|
block discarded – undo |
2465
|
2465
|
$post->{$field_name} = $_REQUEST[$field_name];
|
2466
|
2466
|
}
|
2467
|
2467
|
|
2468
|
|
- if (isset($field['show_in']) && strpos($field['show_in'], '[owntab]') !== false && ((isset($post->{$field_name}) && $post->{$field_name} != '') || $field['type'] == 'fieldset' || $field['type'] == 'address') && in_array($field['type'], array('text', 'datepicker', 'textarea', 'time', 'phone', 'email', 'select', 'multiselect', 'url', 'html', 'fieldset', 'radio', 'checkbox', 'file','address','taxonomy'))) {
|
|
2468
|
+ if (isset($field['show_in']) && strpos($field['show_in'], '[owntab]') !== false && ((isset($post->{$field_name}) && $post->{$field_name} != '') || $field['type'] == 'fieldset' || $field['type'] == 'address') && in_array($field['type'], array('text', 'datepicker', 'textarea', 'time', 'phone', 'email', 'select', 'multiselect', 'url', 'html', 'fieldset', 'radio', 'checkbox', 'file', 'address', 'taxonomy'))) {
|
2469
|
2469
|
$label = $field['site_title'] != '' ? $field['site_title'] : $field['admin_title'];
|
2470
|
2470
|
$site_title = trim($field['site_title']);
|
2471
|
2471
|
$type = $field;
|
|
@@ -2481,21 +2481,21 @@ discard block |
|
|
block discarded – undo |
2481
|
2481
|
$variables_array['label'] = __($type['site_title'], 'geodirectory');
|
2482
|
2482
|
$variables_array['value'] = '';
|
2483
|
2483
|
$variables_array['value'] = $post->{$type['htmlvar_name']};
|
2484
|
|
- }else{
|
|
2484
|
+ } else {
|
2485
|
2485
|
$i = 0;
|
2486
|
2486
|
$fieldset_count++;
|
2487
|
2487
|
$field_set_start = 1;
|
2488
|
|
- $fieldset_arr[$fieldset_count]['htmlvar_name'] = 'gd_tab_' . $fieldset_count;
|
|
2488
|
+ $fieldset_arr[$fieldset_count]['htmlvar_name'] = 'gd_tab_'.$fieldset_count;
|
2489
|
2489
|
$fieldset_arr[$fieldset_count]['label'] = $label;
|
2490
|
2490
|
}
|
2491
|
2491
|
|
2492
|
2492
|
|
2493
|
|
- if(isset($type['extra_fields'])){$extra_fields= $type['extra_fields'];}
|
|
2493
|
+ if (isset($type['extra_fields'])) {$extra_fields = $type['extra_fields']; }
|
2494
|
2494
|
$type = stripslashes_deep($type); // strip slashes
|
2495
|
|
- if(isset($type['extra_fields'])){$type['extra_fields'] = $extra_fields;}
|
|
2495
|
+ if (isset($type['extra_fields'])) {$type['extra_fields'] = $extra_fields; }
|
2496
|
2496
|
$html = '';
|
2497
|
2497
|
$html_var = isset($type['htmlvar_name']) ? $type['htmlvar_name'] : '';
|
2498
|
|
- if($html_var=='post'){$html_var='post_address';}
|
|
2498
|
+ if ($html_var == 'post') {$html_var = 'post_address'; }
|
2499
|
2499
|
$field_icon = geodir_field_icon_proccess($type);
|
2500
|
2500
|
$filed_type = $type['type'];
|
2501
|
2501
|
|
|
@@ -2508,7 +2508,7 @@ discard block |
|
|
block discarded – undo |
2508
|
2508
|
* @param string $fields_location The location the field is to be show.
|
2509
|
2509
|
* @param array $type The array of field values.
|
2510
|
2510
|
*/
|
2511
|
|
- $html = apply_filters("geodir_custom_field_output_{$filed_type}",$html,$fields_location,$type);
|
|
2511
|
+ $html = apply_filters("geodir_custom_field_output_{$filed_type}", $html, $fields_location, $type);
|
2512
|
2512
|
|
2513
|
2513
|
|
2514
|
2514
|
/**
|
|
@@ -2554,7 +2554,7 @@ discard block |
|
|
block discarded – undo |
2554
|
2554
|
* @param string $htmlvar_name The field HTML var name.
|
2555
|
2555
|
*/
|
2556
|
2556
|
'is_display' => apply_filters('geodir_detail_page_tab_is_display', true, $htmlvar_name),
|
2557
|
|
- 'tab_content' => '<div class="geodir-company_info field-group xxx">' . $fieldset_html . '</div>'
|
|
2557
|
+ 'tab_content' => '<div class="geodir-company_info field-group xxx">'.$fieldset_html.'</div>'
|
2558
|
2558
|
);
|
2559
|
2559
|
}
|
2560
|
2560
|
} else {
|
|
@@ -2616,7 +2616,7 @@ discard block |
|
|
block discarded – undo |
2616
|
2616
|
}
|
2617
|
2617
|
$status .= ")</strong>";
|
2618
|
2618
|
|
2619
|
|
- $html = '<span class="geodir-post-status">' . $status_icon . ' <font class="geodir-status-label">' . __('Status: ', 'geodirectory') . '</font>' . $status . '</span>';
|
|
2619
|
+ $html = '<span class="geodir-post-status">'.$status_icon.' <font class="geodir-status-label">'.__('Status: ', 'geodirectory').'</font>'.$status.'</span>';
|
2620
|
2620
|
}
|
2621
|
2621
|
}
|
2622
|
2622
|
|
|
@@ -2685,7 +2685,7 @@ discard block |
|
|
block discarded – undo |
2685
|
2685
|
* @return array Modified class array.
|
2686
|
2686
|
*/
|
2687
|
2687
|
function geodir_body_class_active_map($classes = array()) {
|
2688
|
|
- $classes[] = 'gd-map-' . geodir_map_name();
|
|
2688
|
+ $classes[] = 'gd-map-'.geodir_map_name();
|
2689
|
2689
|
|
2690
|
2690
|
return $classes;
|
2691
|
2691
|
}
|
|
@@ -2700,7 +2700,7 @@ discard block |
|
|
block discarded – undo |
2700
|
2700
|
* @return string Modified class string.
|
2701
|
2701
|
*/
|
2702
|
2702
|
function geodir_admin_body_class_active_map($class = '') {
|
2703
|
|
- $class .= ' gd-map-' . geodir_map_name();
|
|
2703
|
+ $class .= ' gd-map-'.geodir_map_name();
|
2704
|
2704
|
|
2705
|
2705
|
return $class;
|
2706
|
2706
|
}
|
|
@@ -2720,7 +2720,7 @@ discard block |
|
|
block discarded – undo |
2720
|
2720
|
* @return array Translation texts.
|
2721
|
2721
|
*/
|
2722
|
2722
|
function geodir_load_gd_options_text_translation($translation_texts = array()) {
|
2723
|
|
- $translation_texts = !empty( $translation_texts ) && is_array( $translation_texts ) ? $translation_texts : array();
|
|
2723
|
+ $translation_texts = !empty($translation_texts) && is_array($translation_texts) ? $translation_texts : array();
|
2724
|
2724
|
|
2725
|
2725
|
$gd_options = array('geodir_post_submited_success_email_subject_admin', 'geodir_post_submited_success_email_content_admin', 'geodir_post_submited_success_email_subject', 'geodir_post_submited_success_email_content', 'geodir_forgot_password_subject', 'geodir_forgot_password_content', 'geodir_registration_success_email_subject', 'geodir_registration_success_email_content', 'geodir_post_published_email_subject', 'geodir_post_published_email_content', 'geodir_email_friend_subject', 'geodir_email_friend_content', 'geodir_email_enquiry_subject', 'geodir_email_enquiry_content', 'geodir_post_added_success_msg_content', 'geodir_post_edited_email_subject_admin', 'geodir_post_edited_email_content_admin');
|
2726
|
2726
|
|
|
@@ -2786,17 +2786,17 @@ discard block |
|
|
block discarded – undo |
2786
|
2786
|
* @param array $args The array of menu arguments.
|
2787
|
2787
|
* @return array The modified arguments.
|
2788
|
2788
|
*/
|
2789
|
|
-function geodir_add_nav_menu_class( $args )
|
|
2789
|
+function geodir_add_nav_menu_class($args)
|
2790
|
2790
|
{
|
2791
|
2791
|
|
2792
|
|
- if(isset($args['menu_class'])){
|
|
2792
|
+ if (isset($args['menu_class'])) {
|
2793
|
2793
|
$args['menu_class'] = $args['menu_class']." gd-menu-z";
|
2794
|
2794
|
}
|
2795
|
2795
|
|
2796
|
2796
|
return $args;
|
2797
|
2797
|
}
|
2798
|
2798
|
|
2799
|
|
-add_filter( 'wp_nav_menu_args', 'geodir_add_nav_menu_class' );
|
|
2799
|
+add_filter('wp_nav_menu_args', 'geodir_add_nav_menu_class');
|
2800
|
2800
|
|
2801
|
2801
|
/**
|
2802
|
2802
|
* Filters WordPress locale ID.
|
|
@@ -2863,7 +2863,7 @@ discard block |
|
|
block discarded – undo |
2863
|
2863
|
}
|
2864
|
2864
|
|
2865
|
2865
|
if (!empty($keep_vars)) {
|
2866
|
|
- foreach ( $languages as $code => $url) {
|
|
2866
|
+ foreach ($languages as $code => $url) {
|
2867
|
2867
|
$filter_url = $url['url'];
|
2868
|
2868
|
|
2869
|
2869
|
foreach ($keep_vars as $var) {
|
|
@@ -2882,7 +2882,7 @@ discard block |
|
|
block discarded – undo |
2882
|
2882
|
|
2883
|
2883
|
return $languages;
|
2884
|
2884
|
}
|
2885
|
|
-add_filter( 'icl_ls_languages', 'geodir_wpml_filter_ls_languages', 11, 1 );
|
|
2885
|
+add_filter('icl_ls_languages', 'geodir_wpml_filter_ls_languages', 11, 1);
|
2886
|
2886
|
|
2887
|
2887
|
/**
|
2888
|
2888
|
* Remove Yoast SEO hook if disabled on GD pages.
|
|
@@ -2890,18 +2890,18 @@ discard block |
|
|
block discarded – undo |
2890
|
2890
|
* @since 1.6.18
|
2891
|
2891
|
*
|
2892
|
2892
|
*/
|
2893
|
|
-function geodir_remove_yoast_seo_metas(){
|
2894
|
|
- if ( class_exists( 'WPSEO_Frontend' ) && geodir_is_geodir_page() && geodir_disable_yoast_seo_metas() ) {
|
|
2893
|
+function geodir_remove_yoast_seo_metas() {
|
|
2894
|
+ if (class_exists('WPSEO_Frontend') && geodir_is_geodir_page() && geodir_disable_yoast_seo_metas()) {
|
2895
|
2895
|
$wpseo = WPSEO_Frontend::get_instance();
|
2896
|
2896
|
|
2897
|
|
- remove_action( 'wp_head', array( $wpseo, 'metadesc' ), 6 );
|
2898
|
|
- remove_action( 'wp_head', array( $wpseo, 'metakeywords' ), 11 );
|
2899
|
|
- remove_filter( 'pre_get_document_title', array( $wpseo, 'title' ), 15 );
|
2900
|
|
- remove_filter( 'wp_title', array( $wpseo, 'title' ), 15, 3 );
|
2901
|
|
- remove_filter( 'thematic_doctitle', array( $wpseo, 'title' ), 15 );
|
2902
|
|
- remove_filter( 'woo_title', array( $wpseo, 'fix_woo_title' ), 99 );
|
|
2897
|
+ remove_action('wp_head', array($wpseo, 'metadesc'), 6);
|
|
2898
|
+ remove_action('wp_head', array($wpseo, 'metakeywords'), 11);
|
|
2899
|
+ remove_filter('pre_get_document_title', array($wpseo, 'title'), 15);
|
|
2900
|
+ remove_filter('wp_title', array($wpseo, 'title'), 15, 3);
|
|
2901
|
+ remove_filter('thematic_doctitle', array($wpseo, 'title'), 15);
|
|
2902
|
+ remove_filter('woo_title', array($wpseo, 'fix_woo_title'), 99);
|
2903
|
2903
|
|
2904
|
|
- remove_action( 'template_redirect', 'wpseo_frontend_head_init', 999 );
|
|
2904
|
+ remove_action('template_redirect', 'wpseo_frontend_head_init', 999);
|
2905
|
2905
|
}
|
2906
|
2906
|
}
|
2907
|
2907
|
|
|
@@ -2916,19 +2916,19 @@ discard block |
|
|
block discarded – undo |
2916
|
2916
|
*
|
2917
|
2917
|
*/
|
2918
|
2918
|
function geodir_wpml_ajax_set_guest_lang() {
|
2919
|
|
- if ( geodir_is_wpml() && wpml_is_ajax() && !is_user_logged_in() ) {
|
2920
|
|
- if ( empty( $_GET['lang'] ) && !( !empty( $_SERVER['REQUEST_URI'] ) && preg_match( '@\.(css|js|png|jpg|gif|jpeg|bmp)@i', basename( preg_replace( '@\?.*$@', '', $_SERVER['REQUEST_URI'] ) ) ) ) ) {
|
|
2919
|
+ if (geodir_is_wpml() && wpml_is_ajax() && !is_user_logged_in()) {
|
|
2920
|
+ if (empty($_GET['lang']) && !(!empty($_SERVER['REQUEST_URI']) && preg_match('@\.(css|js|png|jpg|gif|jpeg|bmp)@i', basename(preg_replace('@\?.*$@', '', $_SERVER['REQUEST_URI']))))) {
|
2921
|
2921
|
global $sitepress;
|
2922
|
2922
|
|
2923
|
2923
|
$referer = wp_get_referer();
|
2924
|
2924
|
|
2925
|
2925
|
$current_lang = $sitepress->get_current_language();
|
2926
|
|
- $referrer_lang = $sitepress->get_language_from_url( $referer );
|
|
2926
|
+ $referrer_lang = $sitepress->get_language_from_url($referer);
|
2927
|
2927
|
|
2928
|
|
- if ( $referrer_lang && $current_lang != $referrer_lang ) {
|
|
2928
|
+ if ($referrer_lang && $current_lang != $referrer_lang) {
|
2929
|
2929
|
$_GET['lang'] = $referrer_lang;
|
2930
|
2930
|
}
|
2931
|
2931
|
}
|
2932
|
2932
|
}
|
2933
|
2933
|
}
|
2934
|
|
-add_action( 'plugins_loaded', 'geodir_wpml_ajax_set_guest_lang', -1 ); |
2935
|
2934
|
\ No newline at end of file |
|
2935
|
+add_action('plugins_loaded', 'geodir_wpml_ajax_set_guest_lang', -1); |
2936
|
2936
|
\ No newline at end of file |