mikuli.cz

commit 1b4f600ee286739504220ad9a1d0894066e8b5e1
parent 26fc2d41f912e79abe162c3c2642d41f52c4a277
Author: markseu <mark2011@mayberg.se>
Date:   Mon, 27 Jun 2016 23:26:26 +0200

System update (API)

Diffstat:
M
system/plugins/commandline.php
 | 
2
+-
M
system/plugins/core.php
 | 
2
+-
M
system/plugins/update.php
 | 
2
+-
M
system/themes/snippets/navigation-multilanguage.php
 | 
2
+-

4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/system/plugins/commandline.php b/system/plugins/commandline.php
@@ -241,7 +241,7 @@ class YellowCommandline
 		$path = rtrim(empty($path) ? $this->yellow->config->get("staticDir") : $path, '/');
 		if(empty($location))
 		{
-			$statusCode = max($statusCode, $this->commandForward("all", "clean"));
+			$statusCode = max($statusCode, $this->commandForward("clean"));
 			$statusCode = max($statusCode, $this->cleanStaticDirectory($path));
 		} else {
 			$statusCode = $this->cleanStaticFile($path, $location);
diff --git a/system/plugins/core.php b/system/plugins/core.php
@@ -1194,7 +1194,7 @@ class YellowPageCollection extends ArrayObject
 		if($pageNumber>=1 && $pageNumber<=$this->paginationCount)
 		{
 			$pagination = $this->yellow->config->get("contentPagination");
-			$location = $this->yellow->page->getLocation();
+			$location = $this->yellow->page->getLocation(true);
 			$locationArgs = $this->yellow->toolbox->getLocationArgsNew(
 				$pageNumber>1 ? "$pagination:$pageNumber" : "$pagination:", $pagination);
 		}
diff --git a/system/plugins/update.php b/system/plugins/update.php
@@ -146,7 +146,7 @@ class YellowUpdate
 		{
 			$this->yellow->text->setLanguage($language);
 			$rawData = "---\nTitle:".$this->yellow->text->get("webinterfaceInstallationTitle")."\nLanguage:$language\nNavigation:navigation\n---\n";
-			$rawData .= "<form class=\"installation-form\" action=\"".$this->yellow->page->getLocation()."\" method=\"post\">\n";
+			$rawData .= "<form class=\"installation-form\" action=\"".$this->yellow->page->getLocation(true)."\" method=\"post\">\n";
 			$rawData .= "<p><label for=\"name\">".$this->yellow->text->get("webinterfaceSignupName")."</label><br /><input class=\"form-control\" type=\"text\" maxlength=\"64\" name=\"name\" id=\"name\" value=\"\"></p>\n";
 			$rawData .= "<p><label for=\"email\">".$this->yellow->text->get("webinterfaceSignupEmail")."</label><br /><input class=\"form-control\" type=\"text\" maxlength=\"64\" name=\"email\" id=\"email\" value=\"\"></p>\n";
 			$rawData .= "<p><label for=\"password\">".$this->yellow->text->get("webinterfaceSignupPassword")."</label><br /><input class=\"form-control\" type=\"password\" maxlength=\"64\" name=\"password\" id=\"password\" value=\"\"></p>\n";
diff --git a/system/themes/snippets/navigation-multilanguage.php b/system/themes/snippets/navigation-multilanguage.php
@@ -8,7 +8,7 @@
 <li><a<?php echo $page->isActive() ? " class=\"active\"" : "" ?> href="<?php echo $page->getLocation(true) ?>"><?php echo $page->getHtml("titleNavigation") ?></a></li>
 <?php endforeach ?>
 <?php foreach($pagesMultiLanguage as $page): ?>
-<li><a href="<?php echo $page->getLocation().$yellow->toolbox->getLocationArgs() ?>"><?php echo $yellow->text->getTextHtml("languageDescription", $page->get("language")) ?></a></li>
+<li><a href="<?php echo $page->getLocation(true).$yellow->toolbox->getLocationArgs() ?>"><?php echo $yellow->text->getTextHtml("languageDescription", $page->get("language")) ?></a></li>
 <?php endforeach ?>
 </ul>
 </div>