Merge branch 'release-1.3.1'

README.md

@@ -20,9 +20,9 @@
 
 ## Production
 - build CSS & JS assets - `C:\web\dev.biuro\ npm run build`
-- build new image `docker build -t biuro/web:1.3.0 .` (update version number)
+- build new image `docker build -t biuro/web:1.3.1 .` (update version number)
 - login to biuro docker account  `docker login --username=biuro --password=9Ndtjd2vKsLvGuFOeFq1KdJs`
-- push image to docker repository - `docker push biuro/web:1.3.0`
+- push image to docker repository - `docker push biuro/web:1.3.1`
 
 ## Production
 - update biuro/web image version in .env file (staging or www)

wp-content/themes/biuro/functions.php

@@ -19,14 +19,6 @@ function cc_mime_types($mimes) {
 add_filter('upload_mimes', 'cc_mime_types');
 
 
-// 0.9 1.6 2.8 x2
-// 0.9 1.6 1.2 x1
-// 0.9 1.7 1.0 x1
-// 0.9 1.6 1.0 x1
-// 0.9 1.5 1.0 x3
-
-
-
 remove_action('wp_head', 'feed_links_extra', 3); // removes links to rss categories
 remove_action('wp_head', 'feed_links', 2); // minus links to the main rss and comments
 remove_action('wp_head', 'rsd_link'); // Really Simple Discovery service
@@ -822,17 +814,17 @@ function getOptions($taxonomy, $location = '', $str = '') {
 function getResults($taxonomy, $term, $termID) {
     global $wpdb;
 
-    $condition = ($term && $termID) ? " AND `" . $term . "`.`term_id` = " . $termID : '';
-    $structure =  ($term && $termID) ? " LEFT JOIN `wp_term_relationships` AS `rel_term2` ON `rel_term2`.`object_id` = `t`.`ID`
-        INNER JOIN `wp_term_taxonomy` AS `rel_tt_term2` ON `rel_tt_term2`.`taxonomy` = '" . $term . "' AND `rel_tt_term2`.`term_taxonomy_id` = `rel_term2`.`term_taxonomy_id`
-        LEFT JOIN `wp_terms` AS `" . $term . "` ON `" . $term . "`.`term_id` = `rel_tt_term2`.`term_id` " : '';
-
     $langs = pll_the_languages(array('raw'=>1));
     $langID = $langs[pll_current_language('slug')]['id'];
     $prefix = $wpdb->prefix;
     $today = date('Y-m-d');
     $order = ($taxonomy == 'city') ? 'no DESC' : 'total DESC';
 
+    $condition = ($term && $termID) ? " AND `" . $term . "`.`term_id` = " . $termID : '';
+    $structure =  ($term && $termID) ? " LEFT JOIN `{$prefix}term_relationships` AS `rel_term2` ON `rel_term2`.`object_id` = `t`.`ID`
+        INNER JOIN `{$prefix}term_taxonomy` AS `rel_tt_term2` ON `rel_tt_term2`.`taxonomy` = '" . $term . "' AND `rel_tt_term2`.`term_taxonomy_id` = `rel_term2`.`term_taxonomy_id`
+        LEFT JOIN `{$prefix}terms` AS `" . $term . "` ON `" . $term . "`.`term_id` = `rel_tt_term2`.`term_id` " : '';
+
     $sql = "SELECT * FROM (SELECT term.name, count(*) as total, CAST(`termmeta`.`meta_value` as INT) as no, `termpage`.`meta_value` as pageID, `term`.`term_id` as termID, `pages`.`post_title` as title, `pages`.`post_status` as status
         FROM `{$prefix}posts` AS `t`
         LEFT JOIN `{$prefix}postmeta` AS `valid` ON `valid`.`meta_key` = 'valid' AND `valid`.`post_id` = `t`.`ID`