diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-05-01 15:12:12 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-05-01 15:12:12 -0400 |
| commit | c9aa36da061816dee256a979c2ff8d2ee41824d9 (patch) | |
| tree | 29f7002b80ee984b488bd047dbbd80b36bf892e9 /includes/externalstore/ExternalStoreMedium.php | |
| parent | b4274e0e33eafb5e9ead9d949ebf031a9fb8363b (diff) | |
| parent | d1ba966140d7a60cd5ae4e8667ceb27c1a138592 (diff) | |
Merge branch 'archwiki'
# Conflicts:
# skins/ArchLinux.php
# skins/ArchLinux/archlogo.gif
Diffstat (limited to 'includes/externalstore/ExternalStoreMedium.php')
| -rw-r--r-- | includes/externalstore/ExternalStoreMedium.php | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/includes/externalstore/ExternalStoreMedium.php b/includes/externalstore/ExternalStoreMedium.php index 02bdcb51..e9c34a4d 100644 --- a/includes/externalstore/ExternalStoreMedium.php +++ b/includes/externalstore/ExternalStoreMedium.php @@ -29,7 +29,7 @@ * @since 1.21 */ abstract class ExternalStoreMedium { - /** @var Array */ + /** @var array */ protected $params = array(); /** @@ -61,17 +61,18 @@ abstract class ExternalStoreMedium { // Dont return when false to allow for simpler implementations. // errored urls are handled in ExternalStore::batchFetchFromURLs if ( $data !== false ) { - $retval[$urls] = $data; + $retval[$url] = $data; } } + return $retval; } /** * Insert a data item into a given location * - * @param string $location the location name - * @param string $data the data item + * @param string $location The location name + * @param string $data The data item * @return string|bool The URL of the stored data item, or false on error * @throws MWException */ |