hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-17 23:13:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

This is a combination of 33 commits.

Browse Source 
- Squashed Pull request #1730
- Squashed Pull request #1741
- Squashed Pull request #1742
- Squash merge branch 4.0
- Squashed Pull request #1744
- Squashed Pull request #1746
- Squashed merge branch 4.0
- Squashed merge branch 4.0
- Squashed merge branch 4.0
- Squashed merge branch 4.0
- Squashed Pull request #1758
- Avoid using imagine/imagine alias as it is causing install issues
- Squashed merge branch 4.0
- Squashed Pull request #1763
- Squashed merge branch 4.0
- Squash of 6 commits
- Squashed merge branch 4.0
- This is a combination of 2 commits.
- Squashed Pull request #1775
- Squashed Pull request #1777
- Squashed Pull request #1779
- Squashed Pull request #1780
- Squashed Pull request #1782
- Adds a Pull request template
- Squased Pull request #1783
- Squash Pull request #1786
- Squashed Pull request #1796
- Squashed merge branch 4.0
- Squash Pull request #1791
- Squashed merge branch 4.0
- Squashed Pull request #1808
- Squashed Pull request #1811
- Squashed Pull request #1809
This commit is contained in:
Benoît Burnichon
2016-04-19 19:21:04 +02:00
parent 01b06c5144
commit 1e18b3e69f
179 changed files with 5652 additions and 3030 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/classes/recordutils/image.php
View File

@@ -49,7 +49,7 @@ class recordutils_image
}
};
$base_id = $subdef->get_record()->get_base_id();
$base_id = $subdef->get_record()->getBaseId();
if ($subdef->get_type() !== \media_subdef::TYPE_IMAGE) {
return $subdef->getRealPath();
@@ -71,7 +71,7 @@ class recordutils_image
$domprefs = new DOMDocument();
if (false === $domprefs->loadXML($subdef->get_record()->get_collection()->get_prefs())) {
if (false === $domprefs->loadXML($subdef->get_record()->getCollection()->get_prefs())) {
return $subdef->getRealPath();
}
@@ -172,7 +172,7 @@ class recordutils_image
@unlink($pathOut); // no cache possible when date changes
break;
case 'RECORD_ID':
$varval = $subdef->get_record()->get_record_id();
$varval = $subdef->get_record()->getRecordId();
break;
}
$n->parentNode->replaceChild($domprefs->createTextNode($varval), $n);
@@ -381,7 +381,7 @@ class recordutils_image
$palette = new RGB();
}
$base_id = $subdef->get_record()->get_base_id();
$base_id = $subdef->get_record()->getBaseId();
if ($subdef->get_name() !== 'preview') {
return $subdef->getRealPath();
@@ -429,7 +429,7 @@ class recordutils_image
$in_image->paste($wm_image, new Point(($in_w - $wm_size->getWidth()) >> 1, ($in_h - $wm_size->getHeight()) >> 1))->save($pathOut);
} else {
$collname = $subdef->get_record()->get_collection()->get_name();
$collname = $subdef->get_record()->getCollection()->get_name();
$draw = $in_image->draw();
$black = $palette->color("000000");
$white = $palette->color("FFFFFF");