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
Do not insert page titles into querycache.qc_value
[lhc/web/wiklou.git]
/
tests
/
phpunit
/
includes
/
specials
/
SpecialPageExecutor.php
diff --git
a/tests/phpunit/includes/specials/SpecialPageExecutor.php
b/tests/phpunit/includes/specials/SpecialPageExecutor.php
index
e7cfca7
..
abb0d11
100644
(file)
--- a/
tests/phpunit/includes/specials/SpecialPageExecutor.php
+++ b/
tests/phpunit/includes/specials/SpecialPageExecutor.php
@@
-73,6
+73,9
@@
class SpecialPageExecutor {
$this->setEditTokenFromUser( $context );
$this->setEditTokenFromUser( $context );
+ // Make sure the skin context is correctly set https://phabricator.wikimedia.org/T200771
+ $context->getSkin()->setContext( $context );
+
return $context;
}
return $context;
}
@@
-114,15
+117,10
@@
class SpecialPageExecutor {
} else {
$html = $output->getHTML();
}
} else {
$html = $output->getHTML();
}
- }
catch ( Exception $ex )
{
+ }
finally
{
ob_end_clean();
ob_end_clean();
-
- // Re-throw exception after "finally" handling because PHP 5.3 doesn't have "finally".
- throw $ex;
}
}
- ob_end_clean();
-
return $html;
}
return $html;
}