X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fstylesheet.php;h=392ea5a4a5d5ac275cee46c60ca6b87efd5e9926;hb=0fe94791af05018868398d3c6c87d2b16f9557a2;hp=d8e1514d01cc9f8f6bfe938f2f0f3c3724e7a5d9;hpb=f5e6a0a8acafd76f06f1122b4bdc2dc0f9277aa4;p=mailer.git

diff --git a/inc/stylesheet.php b/inc/stylesheet.php
index d8e1514d01..392ea5a4a5 100644
--- a/inc/stylesheet.php
+++ b/inc/stylesheet.php
@@ -69,7 +69,7 @@ if ((getOutputMode() == 1) || (getConfig('css_php') == 'DIRECT')) {
 		if ((isFileReadable($FQFN)) && (filesize($FQFN) > 0)) {
 			switch (getConfig('css_php')) {
 				case 'DIRECT': // Just link them (unsupported)
-					outputHtml('<link rel="stylesheet" type="text/css" href="{?URL?}/theme/' . getCurrentTheme() . '/' . $value . '" />');
+					outputHtml('<link rel="stylesheet" type="text/css" href="{%url=theme/' . getCurrentTheme() . '/' . $value . '%}" />');
 					break;
 
 				case 'FILE': // Output contents
@@ -106,20 +106,20 @@ if ((getOutputMode() == 1) || (getConfig('css_php') == 'DIRECT')) {
 	loadTemplate('css_inline', false, $OUT);
 } else {
 	// Now we load all CSS files from css.php!
-	outputHtml('<link rel="stylesheet" type="text/css" href="{?URL?}/css.php', false);
+	$OUT = '<link rel="stylesheet" type="text/css" href="{%url=css.php';
 	if ((isInstallationPhase())) {
 		// Default theme first
 		$newTheme = 'default';
-		if (isGetRequestElementSet('theme'))  $newTheme = getRequestElement('theme');
-		if (isPostRequestElementSet('theme')) $newTheme = secureString(postRequestElement('theme'));
-		outputHtml('?theme=' . $newTheme . '&amp;installing=1', false);
+		if (isGetRequestParameterSet('theme'))  $newTheme = getRequestParameter('theme');
+		if (isPostRequestParameterSet('theme')) $newTheme = secureString(postRequestParameter('theme'));
+		$OUT .= '?theme=' . $newTheme . '&amp;installing=1';
 	} else {
 		// Add SVN revision to bypass caching problems
-		outputHtml('?rev=' . getConfig('CURR_SVN_REVISION'));
+		$OUT .= '?rev=' . getConfig('CURR_SVN_REVISION');
 	}
 
 	// Close tag
-	outputHtml('" />');
+	outputHtml($OUT . '%}" />');
 }
 
 // [EOF]