Changeset d7b35c2 in github


Ignore:
Timestamp:
Apr 22, 2011 1:48:58 PM (2 years ago)
Author:
alecpl <alec@…>
Branches:
master, HEAD, courier-fix, dev-browser-capabilities, pdo, release-0.6, release-0.7, release-0.8
Children:
a1621c6
Parents:
3a24a1e
Message:
  • Fix usage of non-standard HTTP error codes (#1487797)
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • CHANGELOG

    r4351f7c rd7b35c2  
    22=========================== 
    33 
     4- Fix usage of non-standard HTTP error codes (#1487797) 
    45- Improve performance by including files with absolute path (#1487849) 
    56- TinyMCE 3.4.2 now compatible with IE9 

  • program/steps/utils/error.inc

    ra77cf22 rd7b35c2  
    9292} 
    9393 
     94$HTTP_ERR_CODE = $ERROR_CODE && $ERROR_CODE < 600 ? $ERROR_CODE : 500; 
    9495 
    9596// Ajax request 
    9697if ($OUTPUT && ($OUTPUT instanceof rcube_json_output)) { 
    97   header("HTTP/1.0 $ERROR_CODE $__error_title"); 
     98  header("HTTP/1.0 $HTTP_ERR_CODE $__error_title"); 
    9899  die; 
    99100} 
    … …  
    113114 
    114115$__skin = $CONFIG->skin ? $CONFIG->skin : 'default'; 
     116$__productname = $CONFIG['product_name'] ? $CONFIG['product_name'] : 'Roundcube Webmail'; 
    115117 
    116118// print system error page 
    … …  
    118120<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> 
    119121<html xmlns="http://www.w3.org/1999/xhtml"><head> 
    120 <title>Roundcube|Mail : ERROR $ERROR_CODE</title> 
     122<title>$__productname :: ERROR</title> 
    121123<link rel="stylesheet" type="text/css" href="skins/$__skin/common.css" /> 
    122124</head> 
Note: See TracChangeset for help on using the changeset viewer.