| Index: trunk/extensions/SemanticMediaWiki/includes/SMW_ParserExtensions.php |
| — | — | @@ -23,8 +23,10 @@ |
| 24 | 24 | * |
| 25 | 25 | * @param Parser $parser |
| 26 | 26 | * @param string $text |
| | 27 | + * |
| | 28 | + * @return true |
| 27 | 29 | */ |
| 28 | | - static public function onInternalParseBeforeLinks( &$parser, &$text ) { |
| | 30 | + static public function onInternalParseBeforeLinks( Parser &$parser, &$text ) { |
| 29 | 31 | global $smwgStoreAnnotations, $smwgLinksInValues; |
| 30 | 32 | |
| 31 | 33 | SMWParseData::stripMagicWords( $text, $parser ); |
| Index: trunk/extensions/SemanticMediaWiki/includes/parserhooks/SMW_SetRecurringEvent.php |
| — | — | @@ -197,7 +197,8 @@ |
| 198 | 198 | } |
| 199 | 199 | |
| 200 | 200 | $date_str = "$cur_year-$display_month-$cur_day $cur_time"; |
| 201 | | - $cur_date = SMWDataValueFactory::newTypeIDValue( '_dat', $date_str ); |
| | 201 | + $all_date_strings = array_merge( $all_date_strings, $included_dates); |
| | 202 | + $cur_date_jd = $cur_date->getDataItem()->getJD(); |
| 202 | 203 | } elseif ( $unit == 'dayofweekinmonth' ) { |
| 203 | 204 | // e.g., "3rd Monday of every month" |
| 204 | 205 | $prev_month = $cur_date->getMonth(); |
| — | — | @@ -255,7 +256,7 @@ |
| 256 | 257 | } while ( !$reached_end_date ); |
| 257 | 258 | |
| 258 | 259 | // Handle the 'include' dates as well. |
| 259 | | - $all_date_strings = array_merge( $all_date_strings, $included_dates); |
| | 260 | + $all_date_strings = array_filter( array_merge( $all_date_strings, $included_dates ) ); |
| 260 | 261 | |
| 261 | 262 | return array( $property_name, $all_date_strings, $unused_params ); |
| 262 | 263 | } |