Changeset 21996 for extensions/event_cats

Timestamp:

Apr 3, 2013, 8:48:42 PM (11 years ago)

Author:

LucMorizur

Message:

Compliance with Piwigo 2.5

Location:

extensions/event_cats

Files:

• CHANGELOG.txt (modified) (1 diff)
• include/evntcats_admin_funcs.inc.php (modified) (2 diffs)
• include/evntcats_main_funcs.inc.php (modified) (1 diff)
• main.inc.php (modified) (1 diff)

extensions/event_cats/CHANGELOG.txt

@@ +1 @@
+2013-04-02 1.2.7
+                  Complies with Piwigo 2.5
+
 2011-04-18 1.2.6
                   Fix bug 2267 and small improvements

extensions/event_cats/include/evntcats_admin_funcs.inc.php

@@ -137 +137 @@
     $t2 = 0; $t3 = false; $t4 = false;
     while ( // The check is executed once at minimum
-      !($t3 = pwg_db_fetch_row(pwg_query("
+      (is_null($t3 = pwg_db_fetch_row(pwg_query("
         SELECT `id`
         FROM `".GROUPS_TABLE."`
         WHERE `name` = '".$_POST['groupname']."';
-      "))) and
+      "))) or !$t3) and
       $t2++ == 0 // The check is executed twice at maximum
     )
@@ -615 +615 @@
     }
     else {
+      // There is an issue with pwg_db_insert_id() (actually with procedures
+      // used in pwg_db_insert_id()): if last entry has id 2,
+      // but entries 0 and 1 have been deleted, created entry gets id 3,
+      // but pwg_db_insert_id() returns 0. Thus is it necessary here to get
+      // the id another way.
+      $r = pwg_query("
+        SELECT `id`
+        FROM `".EVNTCATS_TABLE."`
+        WHERE `code` = '".$ec_code."'"
+      );
+      $t2 = pwg_db_fetch_row($r);
+      
       build_ec_lists(); // Don't remember exactly why, but must be done here
       $forced = ($forced == 'false') ? '' : l10n('ec_cnfrm_forced');
       $page['infos'][] =
-       sprintf(l10n('ec_entry_create_OK'), pwg_db_insert_id()).
+       sprintf(l10n('ec_entry_create_OK'), $t2[0]).
        $ec_code.' => '.
        $ec_lists['user_ids'][$ec_user_id].$forced

extensions/event_cats/include/evntcats_main_funcs.inc.php

@@ -83 +83 @@
      AND `image_id` = ".$img
   );
-  return (bool)pwg_num_rows($r);
+  return (bool)pwg_db_num_rows($r);
 }
 

extensions/event_cats/main.inc.php

@@ -44 +44 @@
 define( // -------------------------------------------------------------------
   'EVNTCATS_INFO_VERSION', // VERSION HISTORY :
-   '1.2.6' // Fix bug 2267 « "Test" link in "autolog entries" admin page
+   '1.2.7' // Complies with Piwigo 2.5 
+// '1.2.6' // Fix bug 2267 « "Test" link in "autolog entries" admin page
 //            doesn't work », and small improvements
 // '1.2.5' // Compatibility with Piwigo 2.2 (svn:10052)