Follow-up r77762 per CR, and an unrelated one-character whitespace fix which doesn...

diff --git a/includes/Skin.php b/includes/Skin.php
index f2939d4..a9dbae2 100644 (file)
--- a/includes/Skin.php
+++ b/includes/Skin.php
@@ -2063,24 +2063,24 @@ class Skin extends Linker {
         * Return a fully resolved style path url to images or styles stored in the common folder.
         * This method returns a url resolved using the configured skin style path
         * and includes the style version inside of the url.
-        * @param $name String: The name or path of the common file to return the full path for.
+        * @param $name String: The name or path of a skin resource file
         * @return String The fully resolved style path url including styleversion
         */
        function getCommonStylePath( $name ) {
                global $wgStylePath, $wgStyleVersion;
-               return "{$wgStylePath}/common/$name?{$wgStyleVersion}";
+               return "$wgStylePath/common/$name?$wgStyleVersion";
        }
 
        /**
         * Return a fully resolved style path url to images or styles stored in the curent skins's folder.
         * This method returns a url resolved using the configured skin style path
         * and includes the style version inside of the url.
-        * @param $name String: The name or path of the skin resource file to return the full path for.
+        * @param $name String: The name or path of a skin resource file
         * @return String The fully resolved style path url including styleversion
         */
        function getSkinStylePath( $name ) {
                global $wgStylePath, $wgStyleVersion;
-               return "{$wgStylePath}/{$this->stylename}/$name?{$wgStyleVersion}";
+               return "$wgStylePath/{$this->stylename}/$name?$wgStyleVersion";
        }
 
        /* these are used extensively in SkinTemplate, but also some other places */

diff --git a/tests/phpunit/phpunit.php b/tests/phpunit/phpunit.php
index 762a805..ddba247 100755 (executable)
--- a/tests/phpunit/phpunit.php
+++ b/tests/phpunit/phpunit.php
@@ -9,7 +9,7 @@
 /* Configuration */
 
 // Evaluate the include path relative to this file
-$IP = dirname( dirname( dirname(  __FILE__ ) ) );
+$IP = dirname( dirname( dirname( __FILE__ ) ) );
 
 // Set a flag which can be used to detect when other scripts have been entered through this entry point or not
 define( 'MW_PHPUNIT_TEST', true );