PukiWiki/error/Notice の変更点

• 追加された行はこの色です。
• 削除された行はこの色です。
• PukiWiki/error/Notice へ行く。
• PukiWiki/error/Notice の差分を削除

*File List [#p4786165]
-[[pukiwiki/lib/init.php>#init]]
-[[pukiwiki/lib/convert_html.php>#convert]]
~

*Notice [#h3906e4b]
+Undefined variable ERROR
phpの変数名である$HTTP_SERVER_VARSはphp5系統から$_POSTに変更されたので、
該当箇所を全て
 $HTTP_SERVER_VARS
から
 $_POST
に変更していく
~
+Only variable ERROR
返り値をnewで返している箇所で、一度変数に書き込んだ値を返答する様にする
 return new "hoge";
を
 $ret = new "hoge";
 return $ret;
の様に変数を噛ませる
~
----
~
&aname(init);
&size(16){&font(b){Notice: Undefined variable: HTTP_SERVER_VARS in [DocumentRoot]/pukiwiki/lib/init.php on line "xxx"};};
 # vi [DocumentRoot]/pukiwiki/lib/init.php
-&size(16){&font(b){28行目};};
 -    unset(${$key}, $_SERVER[$key], $HTTP_SERVER_VARS[$key]);
_/_/_/_/_/
 +    unset(${$key}, $_SERVER[$key], $_POST[$key]);
~

-&size(16){&font(b){141行目};};
 -unset(${$ua}, $_SERVER[$ua], $HTTP_SERVER_VARS[$ua], $ua);  // safety
_/_/_/_/_/
 +unset(${$ua}, $_SERVER[$ua], $_POST[$ua], $ua);  // safety
~

-&size(16){&font(b){283行目};};
 -    unset(${$key}, $_SERVER[$key], $HTTP_SERVER_VARS[$key]);
_/_/_/_/_/
 +    unset(${$key}, $_SERVER[$key], $_POST[$key]);
~

-&size(16){&font(b){286行目};};
 -unset($REQUEST_URI, $HTTP_SERVER_VARS['REQUEST_URI']);
_/_/_/_/_/
 +unset($REQUEST_URI, $_POST['REQUEST_URI']);
~
----
~
&aname(convert);
&size(16){&font(b){Notice: Only variable references should be returned by reference in [DocumentRoot]/pukiwiki/lib/convert_html.php on line "xxx"};};
 # vi [DocumentRoot]/pukiwiki/lib/convert_html.php
-&size(16){&font(b){関数：& Factory_Div(& $root, $text)};};
 -            return new Div($matches);
_/_/_/_/_/
 +            $ret = new Div($matches);
 +            return $ret;
~

-&size(16){&font(b){関数：& Factory_Div(& $root, $text)};};
 -            if ($len == 0) {
 -                return new Div($matches); // Seems legacy block plugin
 -            } else if (preg_match('/\{{' . $len . '}\s*\r(.*)\r\}{' . $len . '}/', $text, $body)) {
 -                $matches[2] .= "\r" . $body[1] . "\r";
 -                return new Div($matches); // Seems multiline-enabled block plugin
 -            }
_/_/_/_/_/
 +            if ($len == 0) {
 +                $ret = new Div($matches); // Seems legacy block plugin
 +            } else if (preg_match('/\{{' . $len . '}\s*\r(.*)\r\}{' . $len . '}/', $text, $body)) {
 +                $matches[2] .= "\r" . $body[1] . "\r";
 +                $ret = new Div($matches); // Seems multiline-enabled block plugin
 +            }
 +            return $ret;
~

-&size(16){&font(b){関数：& Factory_Inline($text)};};
 -    // Check the first letter of the line
 -    if (substr($text, 0, 1) == '~') {
 -        return new Paragraph(' ' . substr($text, 1));
 -    } else {
 -        return new Inline($text);
 -    }
_/_/_/_/_/
 +    // Check the first letter of the line
 +    if (substr($text, 0, 1) == '~') {
 +        $ret = new Paragraph(' ' . substr($text, 1));
 +    } else {
 +        $ret = new Inline($text);
 +    }
 +    return $ret;  
~

-&size(16){&font(b){& Factory_DList(& $root, $text)};};
 -        return new DList($out);
_/_/_/_/_/
 +        $ret = new DList($out);
 +        return $ret;
~

-&size(16){&font(b){& Factory_Table(& $root, $text)};};
 -        return new Table($out);
_/_/_/_/_/
 +        return new Table($out);
 +        $ret = Table($out);
 +        return $ret;
~

-&size(16){&font(b){& Factory_YTable(& $root, $text)};};
 -        return new YTable(csv_explode(',', substr($text, 1)));
_/_/_/_/_/
 +        $ret = new YTable(csv_explode(',', substr($text, 1)));
 +        return $ret;
~