Changeset 17653

Timestamp:

Aug 29, 2012, 3:42:35 AM (12 years ago)

Author:

grum

Message:

bug:2710
bug:2731

Location:

extensions/GMaps

Files:

• gmaps_pip.class.inc.php (modified) (4 diffs)
• gmaps_root.class.inc.php (modified) (1 diff)
• gmaps_version.inc.php (modified) (1 diff)
• main.inc.php (modified) (2 diffs)

extensions/GMaps/gmaps_pip.class.inc.php

@@ -369 +369 @@
 
       // check if there is picture with gps tag in the selected category
-      $sql="SELECT paut.tagId, MAX(CAST(pait.value AS DECIMAL(20,17))) AS maxValue, MIN(CAST(pait.value AS DECIMAL(20,17))) AS minValue
+      $sql="SELECT paut.tagId, MAX(CAST(pait.value AS DECIMAL(20,17))) AS cMaxValue, MIN(CAST(pait.value AS DECIMAL(20,17))) AS cMinValue
             FROM (((".USER_CACHE_CATEGORIES_TABLE." pucc
               LEFT JOIN ".CATEGORIES_TABLE." pct ON pucc.cat_id = pct.id)
@@ -385 +385 @@
       if(count($page['items'])==0) return(false);
       // 'tags'
-      $sql="SELECT paut.tagId, MAX(CAST(pait.value AS DECIMAL(20,17))) AS maxValue, MIN(CAST(pait.value AS DECIMAL(20,17))) AS minValue
+      $sql="SELECT paut.tagId, MAX(CAST(pait.value AS DECIMAL(20,17))) AS cMaxValue, MIN(CAST(pait.value AS DECIMAL(20,17))) AS cMinValue
             FROM ".$prefixeTable."amd_images_tags pait
                   LEFT JOIN ".$prefixeTable."amd_used_tags paut ON pait.numId = paut.numId
@@ -400 +400 @@
       $this->buildMapList(0, 'C', self::ID_MODE_CATEGORY);
       // check if there is picture with gps tag in the selected category
-      $sql="SELECT paut.tagId, MAX(CAST(pait.value AS DECIMAL(20,17))) AS maxValue, MIN(CAST(pait.value AS DECIMAL(20,17))) AS minValue
+      $sql="SELECT paut.tagId, MAX(CAST(pait.value AS DECIMAL(20,17))) AS cMaxValue, MIN(CAST(pait.value AS DECIMAL(20,17))) AS cMinValue
             FROM (((".USER_CACHE_CATEGORIES_TABLE." pucc
               LEFT JOIN ".CATEGORIES_TABLE." pct ON pucc.cat_id = pct.id)
@@ -427 +427 @@
           {
             case 'magic.GPS.LatitudeNum':
-              $this->category['bounds']['N']=$row['maxValue'];
-              $this->category['bounds']['S']=$row['minValue'];
+              $this->category['bounds']['N']=$row['cMaxValue'];
+              $this->category['bounds']['S']=$row['cMinValue'];
               break;
             case 'magic.GPS.LongitudeNum':
-              $this->category['bounds']['E']=$row['maxValue'];
-              $this->category['bounds']['W']=$row['minValue'];
+              $this->category['bounds']['E']=$row['cMaxValue'];
+              $this->category['bounds']['W']=$row['cMinValue'];
               break;
           }

extensions/GMaps/gmaps_root.class.inc.php

@@ -212 +212 @@
         if($id!=0)
         {
-          $sql.=" AND (pgcm.categoryId ='$id' or pct.id!='$id' AND pgcm.applySubCat='y') ";
+          $sql.=" AND (pgcm.categoryId ='$id' OR pgcm.applySubCat='y' AND FIND_IN_SET('$id', pct.uppercats)!=0) ";
         }
         else

extensions/GMaps/gmaps_version.inc.php

@@ -15 +15 @@
   if (!defined('PHPWG_ROOT_PATH')) die('Hacking attempt!');
 
-  define('GMAPS_VERSION',  '1.4.0');
-  define('GMAPS_VERSION2', '01.04.00');
+  define('GMAPS_VERSION',  '1.4.1');
+  define('GMAPS_VERSION2', '01.04.01');
   define('GMAPS_GPC_NEEDED', '3.5.2');
   define('GMAPS_AMD_NEEDED', '0.7.0'); //advanced metadata plugin is needed

extensions/GMaps/main.inc.php

@@ -2 +2 @@
 /*
 Plugin Name: GMaps
-Version: 1.4.0
+Version: 1.4.1
 Description: Display and manage (google) maps
 Plugin URI: http://piwigo.org/ext/extension_view.php?eid=454
@@ -125 +125 @@
 |         |            |   . Compatibility with Piwigo 2.4
 |         |            |
+| 1.4.1   | 2012-08-29 | * mantis bug:2731
+|         |            |   . Association between album and map are not always respected
 |         |            |
+|         |            | * mantis bug:2710
+|         |            |   . Incompatibiliy with some MySQL version
 |         |            |
 |         |            |