r83566 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r83565‎ | r83566 | r83567 >
Date:04:49, 9 March 2011
Author:ning
Status:deferred
Tags:
Comment:
Series of update in WOM extension
Modified paths:
  • /trunk/extensions/WikiObjectModel/COPYING (modified) (history)
  • /trunk/extensions/WikiObjectModel/INSTALL (modified) (history)
  • /trunk/extensions/WikiObjectModel/includes/parsers/WOMLinkParser.php (modified) (history)

Diff [purge]

Index: trunk/extensions/WikiObjectModel/INSTALL
@@ -1,7 +1,7 @@
22 == Requirements ==
33
44 * MediaWiki 1.13.5
5 -* Semantic MediaWiki 1.4.3
 5+* Semantic MediaWiki 1.4.3 (optional)
66 * PHP 5.x or greater installed and working
77 * MySQL >= 4.0.14 (version required by MediaWiki)
88
Index: trunk/extensions/WikiObjectModel/includes/parsers/WOMLinkParser.php
@@ -20,7 +20,7 @@
2121 if ( $r && !preg_match( '/^(?:' . wfUrlProtocols() . ')/', $m[1] ) ) {
2222 return array( 'len' => strlen( $m[0] ), 'obj' => new WOMLinkModel( $m[1], isset( $m[3] ) ? $m[3] : '' ) );
2323 }
24 - $r = preg_match( '/^\[([^ \[\]]+)(\s+([^\]]+))?\]/', $text, $m );
 24+ $r = preg_match( '/^\[((?:' . wfUrlProtocols() . ')[^ \[\]]+)(\s+([^\]]+))?\]/', $text, $m );
2525 if ( $r ) {
2626 return array( 'len' => strlen( $m[0] ), 'obj' => new WOMLinkModel( $m[1], isset( $m[3] ) ? $m[3] : '' ) );
2727 }
Index: trunk/extensions/WikiObjectModel/COPYING
@@ -3,7 +3,7 @@
44 "COPYING", or a subdirectory thereof. For those files, the license text contained in
55 said file overrides any license information contained in directories of smaller depth.
66 Alternative licenses are typically used for software that is provided by external
7 -parties, and merely packaged with the Semantic Object Model release for convenience.
 7+parties, and merely packaged with the Wiki Object Model release for convenience.
88 ----
99
1010 GNU GENERAL PUBLIC LICENSE

Status & tagging log