Ticket #2926: sfController.patch

sfController.class.php

@@ -543 +543 @@
-      // put render mode back
-      $this->setRenderMode($renderMode);
-
+      // remove the action entry
+      $nb = $actionStack->getSize() - $index;
+      while ($nb-- > 0)
+      {
+        $actionEntry = $actionStack->popEntry();
+
+        if ($actionEntry->getModuleName() == sfConfig::get('sf_login_module') && $actionEntry->getActionName() == sfConfig::get('sf_login_action'))
+        {
+          $error = 'Your action is secured but the user is not authenticated.';
+
+          throw new sfException($error);
+        }
+        else if ($actionEntry->getModuleName() == sfConfig::get('sf_secure_module') && $actionEntry->getActionName() == sfConfig::get('sf_secure_action'))
+        {
+          $error = 'Your action is secured but the user does not have access.';
+
+          throw new sfException($error);
+        }
+      }
+
-      // remove viewName
-      if ($viewName)
-      {