* Remove manual query building in search mysql

[lhc/web/wiklou.git] / includes / MagicWord.php

diff --git a/includes/MagicWord.php b/includes/MagicWord.php
index 3e66b79..d30f7cc 100644 (file)
--- a/includes/MagicWord.php
+++ b/includes/MagicWord.php
@@ -30,9 +30,13 @@ class MagicWord {
        /**#@+
         * @private
         */
-       var $mId, $mSynonyms, $mCaseSensitive, $mRegex;
-       var $mRegexStart, $mBaseRegex, $mVariableRegex;
-       var $mModified, $mFound;
+       var $mId, $mSynonyms, $mCaseSensitive;
+       var $mRegex = '';
+       var $mRegexStart = '';
+       var $mBaseRegex = '';
+       var $mVariableRegex = '';
+       var $mModified = false;
+       var $mFound = false;
 
        static public $mVariableIDsInitialised = false;
        static public $mVariableIDs = array(
@@ -182,16 +186,10 @@ class MagicWord {
                $this->mId = $id;
                $this->mSynonyms = (array)$syn;
                $this->mCaseSensitive = $cs;
-               $this->mRegex = '';
-               $this->mRegexStart = '';
-               $this->mVariableRegex = '';
-               $this->mVariableStartToEndRegex = '';
-               $this->mModified = false;
        }
 
        /**
         * Factory: creates an object representing an ID
-        * @static
         * @return MagicWord
         */
        static function &get( $id ) {
@@ -482,6 +480,7 @@ class MagicWord {
         * thereby gaining some efficiency. The result is placed in the out variable
         * $result. The return value is true if something was replaced.
         * @static
+        * @todo Should this be static? It doesn't seem to be used at all
         **/
        function replaceMultiple( $magicarr, $subject, &$result ){
                $search = array();