projects
/
Pman.Core
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix #5700 - Order Follow up Table
[Pman.Core]
/
Images.php
diff --git
a/Images.php
b/Images.php
index
54984b9
..
68cc362
100644
(file)
--- a/
Images.php
+++ b/
Images.php
@@
-176,8
+176,6
@@
class Pman_Core_Images extends Pman
}
}
-
-
$img = DB_DataObjecT::factory('Images');
if (!$id || !$img->get($id)) {
$img = DB_DataObjecT::factory('Images');
if (!$id || !$img->get($id)) {
@@
-196,15
+194,13
@@
class Pman_Core_Images extends Pman
if ($comp->comptype != 'OWNER') {
$this->imgErr("not-owner-company",$s);
}
if ($comp->comptype != 'OWNER') {
$this->imgErr("not-owner-company",$s);
}
+
return $this->serve($img);
return $this->serve($img);
-
}
}
-
if(!$this->hasPermission($img)){
$this->imgErr("access to this image/file has been denied.",$s);
if(!$this->hasPermission($img)){
$this->imgErr("access to this image/file has been denied.",$s);
-
}
$this->serve($img);
}
$this->serve($img);
@@
-465,7
+461,8
@@
class Pman_Core_Images extends Pman
$id = $umatch[2];
$hash = '';
if (!empty($umatch[3]) && strpos($umatch[3],'#')) {
$id = $umatch[2];
$hash = '';
if (!empty($umatch[3]) && strpos($umatch[3],'#')) {
- $hash = '#'. array_pop(explode('#',$umatch[3]));
+ $hh = explode('#',$umatch[3]);
+ $hash = '#'. array_pop($hh);
}
}