archive/phabricator
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Revert "Minor change to suppress linter warning"

Browse Source 
This reverts commit 48569f3629. See P1753.
This commit is contained in:
Joshua Spence
2015-04-07 09:05:31 +10:00
parent 30398b6371
commit 14507dc64b
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/applications/console/controller/DarkConsoleDataController.php
View File

@@ -61,7 +61,7 @@ final class DarkConsoleDataController extends PhabricatorController {
// Because cookie names can now be prefixed, wipe out any cookie value // Because cookie names can now be prefixed, wipe out any cookie value
// with the session cookie name anywhere in its name. // with the session cookie name anywhere in its name.
$pattern = '#'.preg_quote(PhabricatorCookies::COOKIE_SESSION, '#').'#'; $pattern = '('.preg_quote(PhabricatorCookies::COOKIE_SESSION).')';
foreach ($_COOKIE as $cookie_name => $cookie_value) { foreach ($_COOKIE as $cookie_name => $cookie_value) {
if (preg_match($pattern, $cookie_name)) { if (preg_match($pattern, $cookie_name)) {
$panel = PhutilSafeHTML::applyFunction( $panel = PhutilSafeHTML::applyFunction(

8
src/infrastructure/markup/rule/PhabricatorObjectRemarkupRule.php
View File

@@ -163,15 +163,15 @@ abstract class PhabricatorObjectRemarkupRule extends PhutilRemarkupRule {
private function getObjectEmbedPattern() { private function getObjectEmbedPattern() {
$prefix = $this->getObjectNamePrefix(); $prefix = $this->getObjectNamePrefix();
$prefix = preg_quote($prefix, '#'); $prefix = preg_quote($prefix);
$id = $this->getObjectIDPattern(); $id = $this->getObjectIDPattern();
return '#\B{'.$prefix.'('.$id.')([,\s](?:[^}\\\\]|\\\\.)*)?}\B#u'; return '(\B{'.$prefix.'('.$id.')([,\s](?:[^}\\\\]|\\\\.)*)?}\B)u';
} }
private function getObjectReferencePattern() { private function getObjectReferencePattern() {
$prefix = $this->getObjectNamePrefix(); $prefix = $this->getObjectNamePrefix();
$prefix = preg_quote($prefix, '@'); $prefix = preg_quote($prefix);
$id = $this->getObjectIDPattern(); $id = $this->getObjectIDPattern();
@@ -192,7 +192,7 @@ abstract class PhabricatorObjectRemarkupRule extends PhutilRemarkupRule {
// The "\b" allows us to link "(abcdef)" or similar without linking things // The "\b" allows us to link "(abcdef)" or similar without linking things
// in the middle of words. // in the middle of words.
return '@(?<![#-])'.$boundary.$prefix.'('.$id.')(?:#([-\w\d]+))?(?!\w)@u'; return '((?<![#-])'.$boundary.$prefix.'('.$id.')(?:#([-\w\d]+))?(?!\w))u';
} }