dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
misc style fix
[lhc/web/wiklou.git]
/
includes
/
MagicWord.php
diff --git
a/includes/MagicWord.php
b/includes/MagicWord.php
index
997034c
..
357eae4
100644
(file)
--- a/
includes/MagicWord.php
+++ b/
includes/MagicWord.php
@@
-299,6
+299,7
@@
class MagicWord {
* Initialises this object with an ID
*
* @param $id
* Initialises this object with an ID
*
* @param $id
+ * @throws MWException
*/
function load( $id ) {
global $wgContLang;
*/
function load( $id ) {
global $wgContLang;
@@
-533,7
+534,7
@@
class MagicWord {
*
* @return string
*/
*
* @return string
*/
- function getVariableRegex()
{
+ function getVariableRegex() {
if ( $this->mVariableRegex == '' ) {
$this->initRegex();
}
if ( $this->mVariableRegex == '' ) {
$this->initRegex();
}
@@
-576,7
+577,7
@@
class MagicWord {
*
* @return bool
*/
*
* @return bool
*/
- function getWasModified(){
+ function getWasModified()
{
return $this->mModified;
}
return $this->mModified;
}
@@
-593,7
+594,7
@@
class MagicWord {
*
* @return bool
*/
*
* @return bool
*/
- function replaceMultiple( $magicarr, $subject, &$result ){
+ function replaceMultiple( $magicarr, $subject, &$result )
{
$search = array();
$replace = array();
foreach( $magicarr as $id => $replacement ){
$search = array();
$replace = array();
foreach( $magicarr as $id => $replacement ){
@@
-645,6
+646,9
@@
class MagicWordArray {
var $baseRegex, $regex;
var $matches;
var $baseRegex, $regex;
var $matches;
+ /**
+ * @param $names array
+ */
function __construct( $names = array() ) {
$this->names = $names;
}
function __construct( $names = array() ) {
$this->names = $names;
}
@@
-772,6
+776,14
@@
class MagicWordArray {
return $newRegex;
}
return $newRegex;
}
+ /**
+ * @since 1.20
+ * @return array
+ */
+ public function getNames() {
+ return $this->names;
+ }
+
/**
* Parse a match array from preg_match
* Returns array(magic word ID, parameter value)
/**
* Parse a match array from preg_match
* Returns array(magic word ID, parameter value)
@@
-779,6
+791,7
@@
class MagicWordArray {
*
* @param $m array
*
*
* @param $m array
*
+ * @throws MWException
* @return array
*/
function parseMatch( $m ) {
* @return array
*/
function parseMatch( $m ) {
@@
-815,7
+828,7
@@
class MagicWordArray {
$regexes = $this->getVariableStartToEndRegex();
foreach ( $regexes as $regex ) {
if ( $regex !== '' ) {
$regexes = $this->getVariableStartToEndRegex();
foreach ( $regexes as $regex ) {
if ( $regex !== '' ) {
- $m =
false
;
+ $m =
array()
;
if ( preg_match( $regex, $text, $m ) ) {
return $this->parseMatch( $m );
}
if ( preg_match( $regex, $text, $m ) ) {
return $this->parseMatch( $m );
}