Changeset 12034

Timestamp:

Sep 2, 2011, 1:13:46 PM (13 years ago)

Author:

icy

Message:

Merge branch 'master' into svn

Location:

extensions/Icy_Picture_Modify

Files:

• CHANGELOG (modified) (1 diff)
• icy_picture_modify.php (modified) (2 diffs)
• main.inc.php (modified) (1 diff)

extensions/Icy_Picture_Modify/CHANGELOG

@@ +1 @@
+1.1.0 2011-09-02
+
+  - Compatible with Piwigo 2.2.3, 2.2.4 and 2.2.5 (There are code changes
+    in both Piwigo and this plugin. If you are using Piwigo 2.2.5 you must
+    install/upgrade to this version of the plugin.)
+
 1.0.3 2011-08-12
 

extensions/Icy_Picture_Modify/icy_picture_modify.php

@@ -332 +332 @@
 
 // tags
+if (version_compare(PHPWG_VERSION, '2.2.5', '<')) {
+  $q_tag_selection = "tag_id, name AS tag_name";
+  $q_tags = 'id AS tag_id, name AS tag_name';
+}
+else {
+  $q_tag_selection = "tag_id AS id, name";
+  $q_tags = 'id, name';
+}
+
 $query = '
 SELECT
-    tag_id,
-    name AS tag_name
+    '.$q_tag_selection.'
   FROM '.IMAGE_TAG_TABLE.' AS it
     JOIN '.TAGS_TABLE.' AS t ON t.id = it.tag_id
@@ -344 +352 @@
 $query = '
 SELECT
-    id AS tag_id,
-    name AS tag_name
+    '.$q_tags.'
   FROM '.TAGS_TABLE.'
 ;';

extensions/Icy_Picture_Modify/main.inc.php

@@ -2 +2 @@
 /*
 Plugin Name: Icy Modify Picture
-Version: 1.0.3
+Version: 1.1.0
 Description: Allow users to modify pictures they uploaded
 Plugin URI: http://piwigo.org/ext/extension_view.php?eid=563