| Index: trunk/extensions/SemanticNotifyMe/includes/SMW_NotifyProcessor.smw15.php |
| — | — | @@ -1151,13 +1151,13 @@ |
| 1152 | 1152 | if ( $property->getWikiValue() != '' ) { |
| 1153 | 1153 | foreach ( $propvalues as $propvalue ) { |
| 1154 | 1154 | if ( $propvalue->getWikiValue() != '' ) { |
| 1155 | | - $result[SMWNotifyProcessor::toInfoId( 2, 0, $sStore->lookupSmwId( SMW_NS_PROPERTY, $property->getWikiValue() ) )][] = array( 'name' => $property, 'value' => $propvalue ); |
| | 1155 | + $result[SMWNotifyProcessor::toInfoId( 2, 0, $sStore->lookupSmwId( SMW_NS_PROPERTY, $property->getDBkey() ) )][] = array( 'name' => $property, 'value' => $propvalue ); |
| 1156 | 1156 | } |
| 1157 | 1157 | } |
| 1158 | 1158 | } else { |
| 1159 | 1159 | foreach ( $propvalues as $propvalue ) { |
| 1160 | 1160 | if ( ( $propvalue instanceof SMWWikiPageValue ) && ( $propvalue->getNamespace() == NS_CATEGORY ) ) { |
| 1161 | | - $result[SMWNotifyProcessor::toInfoId( 0, 0, $sStore->lookupSmwId( NS_CATEGORY, $propvalue->getWikiValue() ) )][] = array( 'name' => $propvalue, 'value' => null ); |
| | 1161 | + $result[SMWNotifyProcessor::toInfoId( 0, 0, $sStore->lookupSmwId( NS_CATEGORY, $propvalue->getDBkey() ) )][] = array( 'name' => $propvalue, 'value' => null ); |
| 1162 | 1162 | } |
| 1163 | 1163 | } |
| 1164 | 1164 | } |
| — | — | @@ -1578,6 +1578,9 @@ |
| 1579 | 1579 | $res = smwfGetStore()->getQueryResult( $query ); |
| 1580 | 1580 | $printer = SMWQueryProcessor::getResultPrinter( $format, SMWQueryProcessor::INLINE_QUERY, $res ); |
| 1581 | 1581 | $result = $printer->getResult( $res, $params, SMW_OUTPUT_HTML ); |
| | 1582 | + // FIXME: hardcode switch to full url |
| | 1583 | + global $wgScriptPath, $wgServer; |
| | 1584 | + $result = str_replace ( $wgScriptPath, $wgServer . $wgScriptPath, $result ); |
| 1582 | 1585 | $html_msg .= $result . '<br/>'; |
| 1583 | 1586 | $html_showall[$notify_id] = array ( 'name' => $notifications[$notify_id]['name'], 'html' => $result ); |
| 1584 | 1587 | |