From: Sam Reed <reedy@users.mediawiki.org>
Date: Tue, 8 Feb 2011 23:09:22 +0000 (+0000)
Subject: Minor documentation tweaks/improvements
X-Git-Tag: 1.31.0-rc.0~32102
X-Git-Url: http://git.cyclocoop.org/ecrire?a=commitdiff_plain;h=e42253eb45baf171bdba1fc01efd3a68bfce48f3;p=lhc%2Fweb%2Fwiklou.git

Minor documentation tweaks/improvements
---

diff --git a/includes/resourceloader/ResourceLoader.php b/includes/resourceloader/ResourceLoader.php
index 5e534427b3..a06f1fe877 100644
--- a/includes/resourceloader/ResourceLoader.php
+++ b/includes/resourceloader/ResourceLoader.php
@@ -143,6 +143,7 @@ class ResourceLoader {
 			return $cacheEntry;
 		}
 
+		$result = '';
 		// Run the filter - we've already verified one of these will work
 		try {
 			switch ( $filter ) {
@@ -253,7 +254,7 @@ class ResourceLoader {
 	 * Get the ResourceLoaderModule object for a given module name.
 	 *
 	 * @param $name String: Module name
-	 * @return Mixed: ResourceLoaderModule if module has been registered, null otherwise
+	 * @return ResourceLoaderModule if module has been registered, null otherwise
 	 */
 	public function getModule( $name ) {
 		if ( !isset( $this->modules[$name] ) ) {
diff --git a/includes/resourceloader/ResourceLoaderStartUpModule.php b/includes/resourceloader/ResourceLoaderStartUpModule.php
index 9015177e9e..081798fcfe 100644
--- a/includes/resourceloader/ResourceLoaderStartUpModule.php
+++ b/includes/resourceloader/ResourceLoaderStartUpModule.php
@@ -27,7 +27,11 @@ class ResourceLoaderStartUpModule extends ResourceLoaderModule {
 	protected $modifiedTime = array();
 
 	/* Protected Methods */
-	
+
+	/**
+	 * @param $context ResourceLoaderContext
+	 * @return array
+	 */
 	protected function getConfig( $context ) {
 		global $wgLoadScript, $wgScript, $wgStylePath, $wgScriptExtension, 
 			$wgArticlePath, $wgScriptPath, $wgServer, $wgContLang, 
diff --git a/includes/resourceloader/ResourceLoaderWikiModule.php b/includes/resourceloader/ResourceLoaderWikiModule.php
index d8cd79bb4c..3d47e7f098 100644
--- a/includes/resourceloader/ResourceLoaderWikiModule.php
+++ b/includes/resourceloader/ResourceLoaderWikiModule.php
@@ -44,7 +44,11 @@ abstract class ResourceLoaderWikiModule extends ResourceLoaderModule {
 	abstract protected function getPages( ResourceLoaderContext $context );
 	
 	/* Protected Methods */
-	
+
+	/**
+	 * @param $title Title
+	 * @return null|string
+	 */
 	protected function getContent( $title ) {
 		if ( $title->getNamespace() === NS_MEDIAWIKI ) {
 			$dbkey = $title->getDBkey();