Changeset 8223

Show
Ignore:
Timestamp:
08/28/09 01:24:09 (2 years ago)
Author:
p_lindheimer
Message:

fixes #3836 use context name in absence of descriptive name in rnav

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/branches/2.6/core/module.xml

    r8221 r8223  
    1010  <canuninstall>no</canuninstall> 
    1111  <changelog> 
    12     *2.6.0beta2.0* #3798, #3609 
     12    *2.6.0beta2.0* #3798, #3609, #3836 
    1313    *2.6.0beta1.4* #3075, #3501, #3636, #3581, #3266, #3701, #3545, #3430 
    1414    *2.6.0beta1.3* trunk tab improvements 

  • modules/branches/2.6/core/page.trunks.php

    r8041 r8223  
    185185    case 'custom': 
    186186    default: 
    187       $label = substr($tresult['name'],0,15)." (".$tresult['tech'].")"; 
     187      $label = substr($tresult['name'],0,15); 
     188      if (trim($label) == '') { 
     189        $label = substr($tresult['channelid'],0,15); 
     190      } 
     191      $label .= " (".$tresult['tech'].")"; 
    188192      break; 
    189193  }