dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
SECURITY: resources: Patch jQuery 3.2.1 for CVE-2019-11358
[lhc/web/wiklou.git]
/
includes
/
skins
/
Skin.php
diff --git
a/includes/skins/Skin.php
b/includes/skins/Skin.php
index
65a300a
..
e2de9ec
100644
(file)
--- a/
includes/skins/Skin.php
+++ b/
includes/skins/Skin.php
@@
-1093,7
+1093,7
@@
abstract class Skin extends ContextSource {
/* these are used extensively in SkinTemplate, but also some other places */
/**
/* these are used extensively in SkinTemplate, but also some other places */
/**
- * @param string $urlaction
+ * @param string
|string[]
$urlaction
* @return string
*/
static function makeMainPageUrl( $urlaction = '' ) {
* @return string
*/
static function makeMainPageUrl( $urlaction = '' ) {
@@
-1110,7
+1110,7
@@
abstract class Skin extends ContextSource {
* URL with the protocol specified.
*
* @param string $name Name of the Special page
* URL with the protocol specified.
*
* @param string $name Name of the Special page
- * @param string $urlaction Query to append
+ * @param string
|string[]
$urlaction Query to append
* @param string|null $proto Protocol to use or null for a local URL
* @return string
*/
* @param string|null $proto Protocol to use or null for a local URL
* @return string
*/
@@
-1126,7
+1126,7
@@
abstract class Skin extends ContextSource {
/**
* @param string $name
* @param string $subpage
/**
* @param string $name
* @param string $subpage
- * @param string $urlaction
+ * @param string
|string[]
$urlaction
* @return string
*/
static function makeSpecialUrlSubpage( $name, $subpage, $urlaction = '' ) {
* @return string
*/
static function makeSpecialUrlSubpage( $name, $subpage, $urlaction = '' ) {
@@
-1136,7
+1136,7
@@
abstract class Skin extends ContextSource {
/**
* @param string $name
/**
* @param string $name
- * @param string $urlaction
+ * @param string
|string[]
$urlaction
* @return string
*/
static function makeI18nUrl( $name, $urlaction = '' ) {
* @return string
*/
static function makeI18nUrl( $name, $urlaction = '' ) {
@@
-1147,7
+1147,7
@@
abstract class Skin extends ContextSource {
/**
* @param string $name
/**
* @param string $name
- * @param string $urlaction
+ * @param string
|string[]
$urlaction
* @return string
*/
static function makeUrl( $name, $urlaction = '' ) {
* @return string
*/
static function makeUrl( $name, $urlaction = '' ) {
@@
-1174,7
+1174,7
@@
abstract class Skin extends ContextSource {
/**
* this can be passed the NS number as defined in Language.php
* @param string $name
/**
* this can be passed the NS number as defined in Language.php
* @param string $name
- * @param string $urlaction
+ * @param string
|string[]
$urlaction
* @param int $namespace
* @return string
*/
* @param int $namespace
* @return string
*/
@@
-1188,7
+1188,7
@@
abstract class Skin extends ContextSource {
/**
* these return an array with the 'href' and boolean 'exists'
* @param string $name
/**
* these return an array with the 'href' and boolean 'exists'
* @param string $name
- * @param string $urlaction
+ * @param string
|string[]
$urlaction
* @return array
*/
static function makeUrlDetails( $name, $urlaction = '' ) {
* @return array
*/
static function makeUrlDetails( $name, $urlaction = '' ) {
@@
-1204,7
+1204,7
@@
abstract class Skin extends ContextSource {
/**
* Make URL details where the article exists (or at least it's convenient to think so)
* @param string $name Article name
/**
* Make URL details where the article exists (or at least it's convenient to think so)
* @param string $name Article name
- * @param string $urlaction
+ * @param string
|string[]
$urlaction
* @return array
*/
static function makeKnownUrlDetails( $name, $urlaction = '' ) {
* @return array
*/
static function makeKnownUrlDetails( $name, $urlaction = '' ) {