Changeset 11844
- Timestamp:
- Jul 27, 2011, 8:19:46 PM (13 years ago)
- Location:
- extensions/Copyrights
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
extensions/Copyrights/image.php
r11794 r11844 56 56 $descr = ''; 57 57 if (count($row) > 0) { 58 // If its the authors default copyright, get the data from the author table, instead of the copyright table 58 59 if ($row['cr_id'] == -1) { 59 $query = sprintf(' 60 SELECT name, url, descr 61 FROM %s 62 WHERE cr_id IN ( 63 SELECT a.copyright 64 FROM '.$prefixeTable.'images i, '.$prefixeTable.'author_extended a 65 WHERE i.id = %d 66 AND i.author = a.name 67 ) 60 // Check if the extended author plugin is active 61 $query = ' 62 SELECT * 63 FROM '.$prefixeTable.'plugins 64 WHERE id=\'Extended_author\' 65 AND state=\'active\' 66 ;'; 67 $result = pwg_query($query); 68 $row = pwg_db_fetch_assoc($result); 69 70 // Only get the authors default copyright when it is active. 71 if (count($row) > 0) { 72 $query = sprintf(' 73 SELECT name, url, descr 74 FROM %s 75 WHERE cr_id IN ( 76 SELECT a.copyright 77 FROM '.$prefixeTable.'images i, '.$prefixeTable.'author_extended a 78 WHERE i.id = %d 79 AND i.author = a.name 80 ) 68 81 ;', 69 82 COPYRIGHTS_ADMIN, $page['image_id']); 70 $result = pwg_query($query); 71 $row = pwg_db_fetch_assoc($result); 83 $result = pwg_query($query); 84 $row = pwg_db_fetch_assoc($result); 85 } 72 86 } 73 87 } 88 // Get the data from the chosen row 74 89 if (count($row) > 0) { 75 90 $name = $row['name']; -
extensions/Copyrights/main.inc.php
r11836 r11844 2 2 /* 3 3 Plugin Name: Copyrights 4 Version: 1. 04 Version: 1.1.1 5 5 Description: Create copyrights and assign them to your photos. 6 6 Plugin URI: http://piwigo.org/ext/extension_view.php?eid=537 -
extensions/Copyrights/maintain.inc.php
r11656 r11844 39 39 CREATE TABLE IF NOT EXISTS ".$prefixeTable."copyrights_media ( 40 40 media_id int(11) NOT NULL, 41 cr_id int(11) default NULL 41 cr_id int(11) NOT NULL, 42 PRIMARY KEY (media_id) 42 43 ) ENGINE = MyISAM DEFAULT CHARACTER SET utf8 43 44 ;";
Note: See TracChangeset
for help on using the changeset viewer.