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
Fix invocation of MWHttpRequest::factory with one argument.
[lhc/web/wiklou.git]
/
includes
/
OutputPage.php
diff --git
a/includes/OutputPage.php
b/includes/OutputPage.php
index
9cf94d8
..
fc7fbf7
100644
(file)
--- a/
includes/OutputPage.php
+++ b/
includes/OutputPage.php
@@
-23,8
+23,9
@@
use MediaWiki\Logger\LoggerFactory;
use MediaWiki\MediaWikiServices;
use MediaWiki\Session\SessionManager;
use MediaWiki\Logger\LoggerFactory;
use MediaWiki\MediaWikiServices;
use MediaWiki\Session\SessionManager;
-use WrappedString\WrappedString;
-use WrappedString\WrappedStringList;
+use Wikimedia\RelPath;
+use Wikimedia\WrappedString;
+use Wikimedia\WrappedStringList;
/**
* This class should be covered by a general architecture document which does
/**
* This class should be covered by a general architecture document which does
@@
-323,7
+324,7
@@
class OutputPage extends ContextSource {
/**
* Redirect to $url rather than displaying the normal page
*
/**
* Redirect to $url rather than displaying the normal page
*
- * @param string $url
URL
+ * @param string $url
* @param string $responsecode HTTP status code
*/
public function redirect( $url, $responsecode = '302' ) {
* @param string $responsecode HTTP status code
*/
public function redirect( $url, $responsecode = '302' ) {
@@
-366,8
+367,8
@@
class OutputPage extends ContextSource {
* Add a new "<meta>" tag
* To add an http-equiv meta tag, precede the name with "http:"
*
* Add a new "<meta>" tag
* To add an http-equiv meta tag, precede the name with "http:"
*
- * @param string $name
Tag name
- * @param string $val
Tag value
+ * @param string $name
Name of the meta tag
+ * @param string $val
Value of the meta tag
*/
function addMeta( $name, $val ) {
array_push( $this->mMetatags, [ $name, $val ] );
*/
function addMeta( $name, $val ) {
array_push( $this->mMetatags, [ $name, $val ] );
@@
-3243,6
+3244,8
@@
class OutputPage extends ContextSource {
&& ( $relevantTitle->exists() || $relevantTitle->quickUserCan( 'create', $user ) );
foreach ( $title->getRestrictionTypes() as $type ) {
&& ( $relevantTitle->exists() || $relevantTitle->quickUserCan( 'create', $user ) );
foreach ( $title->getRestrictionTypes() as $type ) {
+ // Following keys are set in $vars:
+ // wgRestrictionCreate, wgRestrictionEdit, wgRestrictionMove, wgRestrictionUpload
$vars['wgRestriction' . ucfirst( $type )] = $title->getRestrictions( $type );
}
$vars['wgRestriction' . ucfirst( $type )] = $title->getRestrictions( $type );
}
@@
-3816,7
+3819,7
@@
class OutputPage extends ContextSource {
$remotePathPrefix = $remotePath = $uploadPath;
}
$remotePathPrefix = $remotePath = $uploadPath;
}
- $path = RelPath
\
getRelativePath( $path, $remotePath );
+ $path = RelPath
::
getRelativePath( $path, $remotePath );
return self::transformFilePath( $remotePathPrefix, $localDir, $path );
}
return self::transformFilePath( $remotePathPrefix, $localDir, $path );
}