Changeset 12034


Ignore:
Timestamp:
09/02/11 13:13:46 (8 years ago)
Author:
icy
Message:

Merge branch 'master' into svn

Location:
extensions/Icy_Picture_Modify
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • extensions/Icy_Picture_Modify/CHANGELOG

    r11934 r12034  
     11.1.0 2011-09-02 
     2 
     3  - Compatible with Piwigo 2.2.3, 2.2.4 and 2.2.5 (There are code changes 
     4    in both Piwigo and this plugin. If you are using Piwigo 2.2.5 you must 
     5    install/upgrade to this version of the plugin.) 
     6 
    171.0.3 2011-08-12 
    28 
  • extensions/Icy_Picture_Modify/icy_picture_modify.php

    r11934 r12034  
    332332 
    333333// tags 
     334if (version_compare(PHPWG_VERSION, '2.2.5', '<')) { 
     335  $q_tag_selection = "tag_id, name AS tag_name"; 
     336  $q_tags = 'id AS tag_id, name AS tag_name'; 
     337} 
     338else { 
     339  $q_tag_selection = "tag_id AS id, name"; 
     340  $q_tags = 'id, name'; 
     341} 
     342 
    334343$query = ' 
    335344SELECT 
    336     tag_id, 
    337     name AS tag_name 
     345    '.$q_tag_selection.' 
    338346  FROM '.IMAGE_TAG_TABLE.' AS it 
    339347    JOIN '.TAGS_TABLE.' AS t ON t.id = it.tag_id 
     
    344352$query = ' 
    345353SELECT 
    346     id AS tag_id, 
    347     name AS tag_name 
     354    '.$q_tags.' 
    348355  FROM '.TAGS_TABLE.' 
    349356;'; 
  • extensions/Icy_Picture_Modify/main.inc.php

    r11934 r12034  
    22/* 
    33Plugin Name: Icy Modify Picture 
    4 Version: 1.0.3 
     4Version: 1.1.0 
    55Description: Allow users to modify pictures they uploaded 
    66Plugin URI: http://piwigo.org/ext/extension_view.php?eid=563 
Note: See TracChangeset for help on using the changeset viewer.