hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-12 20:43:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'HotFixCache' into 3.6

Browse Source
This commit is contained in:
Romain Neutron
2012-02-22 12:39:17 +01:00
parent 991a43fcd5 2cb18c5d78
commit 8c840091d7
2 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/classes/cache/databox.class.php vendored
View File

@@ -112,6 +112,11 @@ class cache_databox
$field->delete_data_from_cache(); $field->delete_data_from_cache();
} }
foreach($record->get_subdefs() as $subdef)
{
$subdef->delete_data_from_cache();
}
break; break;
case 'structure': case 'structure':
$appbox->delete_data_from_cache(\appbox::CACHE_LIST_BASES); $appbox->delete_data_from_cache(\appbox::CACHE_LIST_BASES);

15
lib/classes/set/export.class.php
View File

@@ -548,10 +548,8 @@ class set_export extends set_abstract
'path' => $sd[$name]->get_path() 'path' => $sd[$name]->get_path()
, 'file' => $sd[$name]->get_file() , 'file' => $sd[$name]->get_file()
); );
if (!$user->ACL()->has_right_on_base( if (!$user->ACL()->has_right_on_base($download_element->get_base_id(), "nowatermark")
$download_element->get_base_id() && !$user->ACL()->has_preview_grant($download_element)
, "nowatermark"
)
&& $sd[$name]->get_type() == media_subdef::TYPE_IMAGE) && $sd[$name]->get_type() == media_subdef::TYPE_IMAGE)
{ {
$path = recordutils_image::watermark( $path = recordutils_image::watermark(
@@ -977,11 +975,12 @@ class set_export extends set_abstract
if (is_file($file)) if (is_file($file))
{ {
$testPath = function($file, $registry){ $testPath = function($file, $registry)
return strpos($file, $registry->get('GV_RootPath').'tmp/download/') !== false {
|| strpos($file, $registry->get('GV_RootPath').'tmp/lazaret/') !== false return strpos($file, $registry->get('GV_RootPath') . 'tmp/download/') !== false
|| strpos($file, $registry->get('GV_RootPath') . 'tmp/lazaret/') !== false
|| strpos($file, $registry->get('GV_X_Accel_Redirect')) !== false; || strpos($file, $registry->get('GV_X_Accel_Redirect')) !== false;
}; };
if ($registry->get('GV_modxsendfile') && $testPath($file, $registry)) if ($registry->get('GV_modxsendfile') && $testPath($file, $registry))
{ {