Development

Changeset 6516

You must first sign up to be able to contribute.

Changeset 6516

Show
Ignore:
Timestamp:
12/16/07 08:22:01 (5 years ago)
Author:
fabien
Message:

added a default exception message for 404 errors

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/lib/action/sfAction.class.php

    r6514 r6516  
    6565   * 
    6666   */ 
    67   public function forward404($message = '') 
    68   { 
    69     throw new sfError404Exception($message); 
     67  public function forward404($message = null) 
     68  { 
     69    throw new sfError404Exception($this->get404Message($message)); 
    7070  } 
    7171 
    …… 
    7878   * @throws sfError404Exception 
    7979   */ 
    80   public function forward404Unless($condition, $message = '') 
     80  public function forward404Unless($condition, $message = null) 
    8181  { 
    8282    if (!$condition) 
    8383    { 
    84       throw new sfError404Exception($message); 
     84      throw new sfError404Exception($this->get404Message($message)); 
    8585    } 
    8686  } 
    …… 
    9494   * @throws sfError404Exception 
    9595   */ 
    96   public function forward404If($condition, $message = '') 
     96  public function forward404If($condition, $message = null) 
    9797  { 
    9898    if ($condition) 
    9999    { 
    100       throw new sfError404Exception($message); 
     100      throw new sfError404Exception($this->get404Message($message)); 
    101101    } 
    102102  } 
    …… 
    513513    sfConfig::set('mod_'.strtolower($this->getModuleName()).'_view_class', $class); 
    514514  } 
     515 
     516  /** 
     517   * Returns a formatted message for a 404 error. 
     518   * 
     519   * @param  string An error message (null by default) 
     520   * 
     521   * @return string The error message or a default one if null 
     522   */ 
     523  protected function get404Message($message = null) 
     524  { 
     525    return is_null($message) ? sprintf('This request has been forwarded to a 404 error page by the action "%s/%s".', $this->getModuleName(), $this->getActionName()) : $message; 
     526  } 
    515527}