Peter M. Groen / knowledgetree

Commit 0ddc42ba479edcf74fc4cb2ad1ca69fec725dd02

Authored by nbm
1 parent 3a2fc0ab

getURL() is expected to include the root URL by itself now. 

Remove unused KTBuiltInFolderAction and friend.


git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@4310 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 1 changed file with 2 additions and 15 deletions
lib/actions/folderaction.inc.php
  View file @0ddc42b
@@ -64,7 +64,7 @@ class KTFolderAction extends KTStandardDispatcher { @@ -64,7 +64,7 @@ class KTFolderAction extends KTStandardDispatcher {
64 } 64 }
65 65
66 function getURL() { 66 function getURL() {
67 - return sprintf("/action.php/%s?fFolderId=%d", $this->sName, $this->oFolder->getID()); 67 + return sprintf("%s/action.php/%s?fFolderId=%d", $GLOBALS['KTRootUrl'], $this->sName, $this->oFolder->getID());
68 } 68 }
69 69
70 function getInfo() { 70 function getInfo() {
@@ -76,7 +76,7 @@ class KTFolderAction extends KTStandardDispatcher { @@ -76,7 +76,7 @@ class KTFolderAction extends KTStandardDispatcher {
76 'disabled' => $this->_disable(), 76 'disabled' => $this->_disable(),
77 'description' => $this->sDescription, 77 'description' => $this->sDescription,
78 'name' => $this->sDisplayName, 78 'name' => $this->sDisplayName,
79 - 'url' => generateLink($this->getURL(), ""), 79 + 'url' => $this->getURL(),
80 'disabled_text' => $this->_sDisabledText, 80 'disabled_text' => $this->_sDisabledText,
81 ); 81 );
82 return $this->customiseInfo($aInfo); 82 return $this->customiseInfo($aInfo);
@@ -146,17 +146,4 @@ class KTFolderActionUtil { @@ -146,17 +146,4 @@ class KTFolderActionUtil {
146 } 146 }
147 } 147 }
148 148
149 -class KTBuiltInFolderAction extends KTFolderAction {  
150 - var $sBuiltInAction;  
151 - function getURL() {  
152 - return sprintf("/control.php?action=%s&fFolderID=%d", $this->sBuiltInAction, $this->oFolder->getID());  
153 - }  
154 -}  
155 -  
156 -class KTBuiltInFolderActionSingle extends KTBuiltInFolderAction {  
157 - function getURL() {  
158 - return sprintf("/control.php?action=%s&fFolderIDs[]=%d&fReturnFolderID=%d", $this->sBuiltInAction, $this->oFolder->getID(), $this->oFolder->getID());  
159 - }  
160 -}  
161 -  
162 ?> 149 ?>