Author: Lars Michelsen <[email protected]>
Date: Thu Jan 26 23:41:02 2012 +0100
Committer: Lars Michelsen <[email protected]>
Commit-Date: Thu Jan 26 23:41:02 2012 +0100
FIX: Fixed wrong computed shape urls which broke all shapes
---
ChangeLog | 1 +
share/server/core/classes/objects/NagVisShape.php | 10 +++++-----
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 96d97a4..5c56377 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,7 @@
Core
* Made template objects work again. Added doc note which does not recommend
usage of templates and the webbased editor at the same time.
+ * FIX: Fixed wrong computed shape urls which broke all shapes
1.6.3
Core
diff --git a/share/server/core/classes/objects/NagVisShape.php
b/share/server/core/classes/objects/NagVisShape.php
index 4a5d1cb..aa1b627 100644
--- a/share/server/core/classes/objects/NagVisShape.php
+++ b/share/server/core/classes/objects/NagVisShape.php
@@ -35,9 +35,9 @@ class NagVisShape extends NagVisStatelessObject {
* @author Lars Michelsen <[email protected]>
*/
public function __construct($CORE, $icon) {
- if(parent::$iconPath === null) {
- parent::$iconPath = cfg('sys', 'global', 'shapes');
- parent::$iconPathLocal = cfg('sys', 'local', 'shapes');
+ if(self::$iconPath === null) {
+ self::$iconPath = $CORE->getMainCfg()->getPath('sys',
'global', 'shapes');
+ self::$iconPathLocal = $CORE->getMainCfg()->getPath('sys',
'local', 'shapes');
}
$this->icon = $icon;
@@ -84,8 +84,8 @@ class NagVisShape extends NagVisStatelessObject {
*/
public function fetchIcon() {
if($this->icon[0] != '[') {
- if(!file_exists(parent::$iconPath . $this->icon)
- && !file_exists(parent::$iconPathLocal . $this->icon)) {
+ if(!file_exists(self::$iconPath . $this->icon)
+ && !file_exists(self::$iconPathLocal . $this->icon)) {
$this->icon = 'std_dummy.png';
}
}
------------------------------------------------------------------------------
Keep Your Developer Skills Current with LearnDevNow!
The most comprehensive online learning library for Microsoft developers
is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3,
Metro Style Apps, more. Free future releases when you subscribe now!
http://p.sf.net/sfu/learndevnow-d2d
_______________________________________________
Nagvis-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/nagvis-checkins
