allow uploading a route as a file

[syj.git] / application / views / helpers / FooterLink.php

diff --git a/application/views/helpers/FooterLink.php b/application/views/helpers/FooterLink.php
index 50a2f0b8abde8b2accf8c8db030fc9503a20a181..cebae509b396d2fb277749d89d6391423ae56365 100644 (file)
--- a/application/views/helpers/FooterLink.php
+++ b/application/views/helpers/FooterLink.php
@@ -4,14 +4,17 @@
 
 class Syj_View_Helper_FooterLink extends Zend_View_Helper_Abstract
 {
-    public function FooterLink($routeoptions, $text, $redirect=true, $extraclass=null) {
+    public function FooterLink($routeoptions, $text, $redirect=true, $extraclass=null, $extratext="") {
         $page = new Zend_Navigation_Page_Mvc($routeoptions);
         if ($page->isActive()) {
             $link = $this->view->escape($text);
         } else {
             $href = $page->getHRef();
             if ($redirect) {
-                $currentUri = $this->view->url();
+                $currentUri = Zend_Controller_Front::getInstance()->getRequest()->getRequestUri();
+                if (($pos = strpos($currentUri, '?')) !== false) {
+                    $currentUri = substr($currentUri, 0, $pos);
+                 }
                 $href = $this->view->addParamToUrl($href, 'redirect', $currentUri, true);
             }
             $link = $this->view->anchor($href, $text, array('class' => 'footer-anchor'));
@@ -20,7 +23,7 @@ class Syj_View_Helper_FooterLink extends Zend_View_Helper_Abstract
         if (isset($extraclass)) {
             $class = "$class $extraclass";
         }
-        return '<div class="' . $class . '">' . $link . '</div>' . PHP_EOL;
+        return '<div class="' . $class . '">' . $link . $extratext . '</div>' . PHP_EOL;
     }
 }