Skip to content

Commit

Permalink
Removed the final keyword on some methods of jResponseHtml
Browse files Browse the repository at this point in the history
  • Loading branch information
laurentj committed Aug 24, 2011
1 parent 80f22f4 commit 072d198
Showing 1 changed file with 9 additions and 16 deletions.
25 changes: 9 additions & 16 deletions lib/jelix/core/response/jResponseHtml.class.php
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ function __construct (){
*
* @return boolean true if the generated content is ok
*/
final public function output(){
public function output(){
$this->doAfterActions();

$this->_headSent = 0;
Expand Down Expand Up @@ -247,7 +247,7 @@ protected function doAfterActions(){
/**
* output errors
*/
final public function outputErrors(){
public function outputErrors(){
if($this->_headSent < 1){
if(!$this->_httpHeadersSent){
header("HTTP/1.0 500 Internal Server Error");
Expand Down Expand Up @@ -435,7 +435,7 @@ protected function outputDoctype (){
}
}

final protected function outputJsScriptTag( $fileUrl, $scriptParams, $filePath = null ) {
protected function outputJsScriptTag( $fileUrl, $scriptParams, $filePath = null ) {
global $gJConfig;

$params = '';
Expand All @@ -457,9 +457,7 @@ final protected function outputJsScriptTag( $fileUrl, $scriptParams, $filePath =
echo '<script type="text/javascript" src="',htmlspecialchars($fileUrl),$jsFilemtime,'" ',$params,'></script>',"\n";
}



final protected function outputCssLinkTag( $fileUrl, $cssParams, $filePath = null ) {
protected function outputCssLinkTag( $fileUrl, $cssParams, $filePath = null ) {
global $gJConfig;

$params = '';
Expand All @@ -481,10 +479,7 @@ final protected function outputCssLinkTag( $fileUrl, $cssParams, $filePath = nul
echo '<link type="text/css" href="',htmlspecialchars($fileUrl),$cssFilemtime,'" ',$params,$this->_endTag,"\n";
}




final protected function outputJsScripts( &$scriptList ) {
protected function outputJsScripts( &$scriptList ) {
global $gJConfig;

$minifyJsByParams = array();
Expand Down Expand Up @@ -541,9 +536,7 @@ final protected function outputJsScripts( &$scriptList ) {
}
}



final protected function outputCssLinks( &$linkList ) {
protected function outputCssLinks( &$linkList ) {
global $gJConfig;

$minifyCssByParams = array();
Expand Down Expand Up @@ -617,7 +610,7 @@ final protected function outputCssLinks( &$linkList ) {
/**
* generate the content of the <head> content
*/
final protected function outputHtmlHeader (){
protected function outputHtmlHeader (){
global $gJConfig;

echo '<head>'."\n";
Expand Down Expand Up @@ -727,7 +720,7 @@ final protected function outputHtmlHeader (){
* used to erase some head properties
* @param array $what list of one or many of this strings : 'CSSLink', 'CSSIELink', 'Styles', 'JSLink', 'JSIELink', 'JSCode', 'Others','MetaKeywords','MetaDescription'. If null, it cleans all values.
*/
final public function clearHtmlHeader ($what=null){
public function clearHtmlHeader ($what=null){
$cleanable = array ('CSSLink', 'CSSIELink', 'Styles', 'JSLink','JSIELink', 'JSCode', 'Others','MetaKeywords','MetaDescription');
if($what==null)
$what= $cleanable;
Expand All @@ -743,7 +736,7 @@ final public function clearHtmlHeader ($what=null){
* change the type of html for the output
* @param boolean $xhtml true if you want xhtml, false if you want html
*/
final public function setXhtmlOutput($xhtml = true){
public function setXhtmlOutput($xhtml = true){
$this->_isXhtml = $xhtml;
if($xhtml)
$this->_endTag = "/>\n";
Expand Down

0 comments on commit 072d198

Please sign in to comment.