| Index: trunk/extensions/SemanticResultFormats/Calendar/SRF_Calendar.php |
| — | — | @@ -69,7 +69,12 @@ |
| 70 | 70 | if ( $object->getTypeID() == '_dat' ) { |
| 71 | 71 | $text .= SRFCalendar::formatDateStr( $object ); |
| 72 | 72 | } elseif ( $object->getTypeID() == '_wpg' ) { // use shorter "LongText" for wikipage |
| 73 | | - $text .= $object->getLongText( $outputmode, null ); |
| | 73 | + // handling of "link=" param |
| | 74 | + if ( $this->mLinkOthers ) { |
| | 75 | + $text .= $object->getLongText( $outputmode, null ); |
| | 76 | + } else { |
| | 77 | + $text .= $object->getWikiValue(); |
| | 78 | + } |
| 74 | 79 | } else { |
| 75 | 80 | $text .= $object->getShortText( $outputmode, null ); |
| 76 | 81 | } |
| — | — | @@ -86,13 +91,25 @@ |
| 87 | 92 | elseif ( $i > 2 ) |
| 88 | 93 | $text .= ", "; |
| 89 | 94 | while ( ( $object = $field->getNextObject() ) !== false ) { |
| 90 | | - if ( $object->getTypeID() == '_dat' ) { // use shorter "LongText" for wikipage |
| | 95 | + if ( $object->getTypeID() == '_dat' ) { |
| 91 | 96 | // don't add date values to the display |
| 92 | 97 | } elseif ( $object->getTypeID() == '_wpg' ) { // use shorter "LongText" for wikipage |
| 93 | 98 | if ( $i == 0 ) { |
| 94 | 99 | $title = Title::newFromText( $object->getShortWikiText( false ) ); |
| 95 | 100 | } else { |
| 96 | | - $text .= $pr->getHTMLText( $skin ) . " " . $object->getLongText( $outputmode, $skin ); |
| | 101 | + // handling of "headers=" param |
| | 102 | + if ( $this->mShowHeaders == SMW_HEADERS_SHOW ) { |
| | 103 | + $text .= $pr->getHTMLText( $skin ) . " "; |
| | 104 | + } elseif ( $this->mShowHeaders == SMW_HEADERS_PLAIN ) { |
| | 105 | + $text .= $pr->getLabel() . " "; |
| | 106 | + } |
| | 107 | + // if $this->mShowHeaders == SMW_HEADERS_HIDE, print nothing |
| | 108 | + // handling of "link=" param |
| | 109 | + if ( $this->mLinkOthers ) { |
| | 110 | + $text .= $object->getLongText( $outputmode, $skin ); |
| | 111 | + } else { |
| | 112 | + $text .= $object->getWikiValue(); |
| | 113 | + } |
| 97 | 114 | } |
| 98 | 115 | } else { |
| 99 | 116 | $text .= $pr->getHTMLText( $skin ) . " " . $object->getShortText( $outputmode, $skin ); |