| Index: trunk/phase3/tests/phpunit/phpunit.php |
| — | — | @@ -9,7 +9,7 @@ |
| 10 | 10 | /* Configuration */ |
| 11 | 11 | |
| 12 | 12 | // Evaluate the include path relative to this file |
| 13 | | -$IP = dirname( dirname( dirname( __FILE__ ) ) ); |
| | 13 | +$IP = dirname( dirname( dirname( __FILE__ ) ) ); |
| 14 | 14 | |
| 15 | 15 | // Set a flag which can be used to detect when other scripts have been entered through this entry point or not |
| 16 | 16 | define( 'MW_PHPUNIT_TEST', true ); |
| Index: trunk/phase3/includes/Skin.php |
| — | — | @@ -2063,24 +2063,24 @@ |
| 2064 | 2064 | * Return a fully resolved style path url to images or styles stored in the common folder. |
| 2065 | 2065 | * This method returns a url resolved using the configured skin style path |
| 2066 | 2066 | * and includes the style version inside of the url. |
| 2067 | | - * @param $name String: The name or path of the common file to return the full path for. |
| | 2067 | + * @param $name String: The name or path of a skin resource file |
| 2068 | 2068 | * @return String The fully resolved style path url including styleversion |
| 2069 | 2069 | */ |
| 2070 | 2070 | function getCommonStylePath( $name ) { |
| 2071 | 2071 | global $wgStylePath, $wgStyleVersion; |
| 2072 | | - return "{$wgStylePath}/common/$name?{$wgStyleVersion}"; |
| | 2072 | + return "$wgStylePath/common/$name?$wgStyleVersion"; |
| 2073 | 2073 | } |
| 2074 | 2074 | |
| 2075 | 2075 | /** |
| 2076 | 2076 | * Return a fully resolved style path url to images or styles stored in the curent skins's folder. |
| 2077 | 2077 | * This method returns a url resolved using the configured skin style path |
| 2078 | 2078 | * and includes the style version inside of the url. |
| 2079 | | - * @param $name String: The name or path of the skin resource file to return the full path for. |
| | 2079 | + * @param $name String: The name or path of a skin resource file |
| 2080 | 2080 | * @return String The fully resolved style path url including styleversion |
| 2081 | 2081 | */ |
| 2082 | 2082 | function getSkinStylePath( $name ) { |
| 2083 | 2083 | global $wgStylePath, $wgStyleVersion; |
| 2084 | | - return "{$wgStylePath}/{$this->stylename}/$name?{$wgStyleVersion}"; |
| | 2084 | + return "$wgStylePath/{$this->stylename}/$name?$wgStyleVersion"; |
| 2085 | 2085 | } |
| 2086 | 2086 | |
| 2087 | 2087 | /* these are used extensively in SkinTemplate, but also some other places */ |