composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-18 16:18:47 +02:00
Code Issues Packages Projects Releases Wiki Activity

N°7315 - Migrate usages in TwigBase::Controller to use new API if possible

Browse Source
This commit is contained in:
Molkobain
2024-03-12 11:21:37 +01:00
parent 7a7b7381c9
commit d7270c56cd
1 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
sources/Application/TwigBase/Controller/Controller.php
View File

@@ -583,6 +583,7 @@ abstract class Controller extends AbstractController
* @api
*
* @param string $sScript Script path to link
* @since 3.2.0 $sScript must be absolute URI
*/
public function AddLinkedScript($sScript)
{
@@ -595,6 +596,7 @@ abstract class Controller extends AbstractController
* @api
*
* @param string $sStylesheet Stylesheet path to link
* @since 3.2.0 $sScript must be absolute URI
*/
public function AddLinkedStylesheet($sStylesheet)
{
@@ -769,12 +771,23 @@ abstract class Controller extends AbstractController
private function AddLinkedScriptToPage($sLinkedScript)
{
$this->m_oPage->add_linked_script($sLinkedScript);
// iTop 3.1 and older compatibility, if not an URI we don't know if its relative to app root or module root
if (strpos($sLinkedScript, "://") === false) {
$this->m_oPage->add_linked_script($sLinkedScript);
return;
}
$this->m_oPage->LinkScriptFromURI($sLinkedScript);
}
private function AddLinkedStylesheetToPage($sLinkedStylesheet)
{
$this->m_oPage->add_linked_stylesheet($sLinkedStylesheet);
// iTop 3.1 and older compatibility, if not an URI we don't know if its relative to app root or module root
if (strpos($sLinkedStylesheet, "://") === false) {
$this->m_oPage->add_linked_stylesheet($sLinkedStylesheet);
}
$this->m_oPage->LinkStylesheetFromURI($sLinkedStylesheet);
}
private function AddStyleToPage($sStyle)