[core:xpwiki] give keyword "public static" to "static function"

nao-pon · nao-pon · commit dfc60dd9c285 · 2013-08-24T16:11:22.000+09:00
diff --git a/xoops_trust_path/modules/xpwiki/class/xpwiki.php b/xoops_trust_path/modules/xpwiki/class/xpwiki.php
@@ -68,7 +68,7 @@ function XpWiki ($mydirname, $moddir='modules/') {
 
 	}
 
-	function & getSingleton ($mddir, $iniClear = true) {
+	public static function & getSingleton ($mddir, $iniClear = true) {
 		static $obj;
 		if (! isset($obj[$mddir])) {
 			$obj[$mddir] = new XpWiki($mddir);
@@ -82,7 +82,7 @@ function & getSingleton ($mddir, $iniClear = true) {
 		return $obj[$mddir];
 	}
 
-	function & getInitedSingleton ($mddir) {
+	public static function & getInitedSingleton ($mddir) {
 		static $obj;
 		if (! isset($obj[$mddir])) {
 			$obj[$mddir] = new XpWiki($mddir);

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ function XpWiki ($mydirname, $moddir='modules/') {`
`68`	`68`
`69`	`69`	`}`
`70`	`70`
`71`		`- function & getSingleton ($mddir, $iniClear = true) {`
	`71`	`+ public static function & getSingleton ($mddir, $iniClear = true) {`
`72`	`72`	`static $obj;`
`73`	`73`	`if (! isset($obj[$mddir])) {`
`74`	`74`	`$obj[$mddir] = new XpWiki($mddir);`
`@@ -82,7 +82,7 @@ function & getSingleton ($mddir, $iniClear = true) {`
`82`	`82`	`return $obj[$mddir];`
`83`	`83`	`}`
`84`	`84`
`85`		`- function & getInitedSingleton ($mddir) {`
	`85`	`+ public static function & getInitedSingleton ($mddir) {`
`86`	`86`	`static $obj;`
`87`	`87`	`if (! isset($obj[$mddir])) {`
`88`	`88`	`$obj[$mddir] = new XpWiki($mddir);`