Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
D
drupal
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Custom Issue Tracker
Custom Issue Tracker
Labels
Merge Requests
224
Merge Requests
224
Requirements
Requirements
List
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Analytics
Analytics
Code Review
Insights
Issue
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
project
drupal
Commits
80fbd33d
Commit
80fbd33d
authored
Dec 03, 2013
by
jhodgdon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Issue
#2145077
by TR, longwave: Fix about a zillion spelling errors, mostly in comments
parent
3caa9d60
Changes
71
Hide whitespace changes
Inline
Side-by-side
Showing
71 changed files
with
114 additions
and
112 deletions
+114
-112
core/includes/bootstrap.inc
core/includes/bootstrap.inc
+1
-1
core/includes/common.inc
core/includes/common.inc
+1
-1
core/includes/install.core.inc
core/includes/install.core.inc
+3
-3
core/lib/Drupal/Component/Annotation/Plugin.php
core/lib/Drupal/Component/Annotation/Plugin.php
+1
-1
core/lib/Drupal/Component/Gettext/PoStreamReader.php
core/lib/Drupal/Component/Gettext/PoStreamReader.php
+5
-5
core/lib/Drupal/Component/Plugin/PluginInspectionInterface.php
...lib/Drupal/Component/Plugin/PluginInspectionInterface.php
+1
-1
core/lib/Drupal/Component/Utility/Number.php
core/lib/Drupal/Component/Utility/Number.php
+1
-1
core/lib/Drupal/Component/Utility/Unicode.php
core/lib/Drupal/Component/Utility/Unicode.php
+5
-5
core/lib/Drupal/Component/Utility/Url.php
core/lib/Drupal/Component/Utility/Url.php
+2
-2
core/lib/Drupal/Core/Asset/CssOptimizer.php
core/lib/Drupal/Core/Asset/CssOptimizer.php
+1
-1
core/lib/Drupal/Core/Controller/ExceptionController.php
core/lib/Drupal/Core/Controller/ExceptionController.php
+3
-3
core/lib/Drupal/Core/Entity/Query/Sql/Tables.php
core/lib/Drupal/Core/Entity/Query/Sql/Tables.php
+1
-1
core/lib/Drupal/Core/EventSubscriber/SpecialAttributesRouteSubscriber.php
...Core/EventSubscriber/SpecialAttributesRouteSubscriber.php
+2
-1
core/lib/Drupal/Core/Template/TwigEnvironment.php
core/lib/Drupal/Core/Template/TwigEnvironment.php
+1
-1
core/misc/tableheader.js
core/misc/tableheader.js
+1
-1
core/modules/ban/lib/Drupal/ban/EventSubscriber/BanSubscriber.php
...ules/ban/lib/Drupal/ban/EventSubscriber/BanSubscriber.php
+1
-1
core/modules/block/lib/Drupal/block/Tests/Views/DisplayBlockTest.php
...s/block/lib/Drupal/block/Tests/Views/DisplayBlockTest.php
+1
-1
core/modules/content_translation/content_translation.module
core/modules/content_translation/content_translation.module
+1
-1
core/modules/datetime/lib/Drupal/datetime/DateHelper.php
core/modules/datetime/lib/Drupal/datetime/DateHelper.php
+2
-2
core/modules/dblog/lib/Drupal/dblog/Tests/DbLogTest.php
core/modules/dblog/lib/Drupal/dblog/Tests/DbLogTest.php
+1
-1
core/modules/edit/js/models/FieldModel.js
core/modules/edit/js/models/FieldModel.js
+3
-3
core/modules/edit/js/views/EditorView.js
core/modules/edit/js/views/EditorView.js
+1
-1
core/modules/file/lib/Drupal/file/Tests/DownloadTest.php
core/modules/file/lib/Drupal/file/Tests/DownloadTest.php
+1
-1
core/modules/image/lib/Drupal/image/Tests/ImageStylesPathAndUrlTest.php
...mage/lib/Drupal/image/Tests/ImageStylesPathAndUrlTest.php
+3
-3
core/modules/language/language.negotiation.inc
core/modules/language/language.negotiation.inc
+2
-2
core/modules/language/lib/Drupal/language/Tests/LanguageBrowserDetectionUnitTest.php
...rupal/language/Tests/LanguageBrowserDetectionUnitTest.php
+2
-2
core/modules/locale/lib/Drupal/locale/Tests/LocaleImportFunctionalTest.php
...le/lib/Drupal/locale/Tests/LocaleImportFunctionalTest.php
+1
-1
core/modules/locale/locale.admin.js
core/modules/locale/locale.admin.js
+1
-1
core/modules/locale/locale.batch.inc
core/modules/locale/locale.batch.inc
+3
-3
core/modules/locale/locale.bulk.inc
core/modules/locale/locale.bulk.inc
+1
-1
core/modules/locale/tests/modules/locale_test/locale_test.module
...dules/locale/tests/modules/locale_test/locale_test.module
+1
-1
core/modules/node/lib/Drupal/node/Tests/NodeTypeInitialLanguageTest.php
...ode/lib/Drupal/node/Tests/NodeTypeInitialLanguageTest.php
+1
-1
core/modules/options/lib/Drupal/options/Tests/OptionsWidgetsTest.php
...s/options/lib/Drupal/options/Tests/OptionsWidgetsTest.php
+1
-1
core/modules/rest/lib/Drupal/rest/Tests/AuthTest.php
core/modules/rest/lib/Drupal/rest/Tests/AuthTest.php
+1
-1
core/modules/simpletest/lib/Drupal/simpletest/TestBase.php
core/modules/simpletest/lib/Drupal/simpletest/TestBase.php
+1
-1
core/modules/system/language.api.php
core/modules/system/language.api.php
+1
-1
core/modules/system/lib/Drupal/system/Tests/Cache/GenericCacheBackendUnitTestBase.php
...al/system/Tests/Cache/GenericCacheBackendUnitTestBase.php
+1
-1
core/modules/system/lib/Drupal/system/Tests/Database/MergeTest.php
...les/system/lib/Drupal/system/Tests/Database/MergeTest.php
+1
-1
core/modules/system/lib/Drupal/system/Tests/Database/SelectTest.php
...es/system/lib/Drupal/system/Tests/Database/SelectTest.php
+1
-1
core/modules/system/lib/Drupal/system/Tests/DrupalKernel/ContentNegotiationTest.php
...upal/system/Tests/DrupalKernel/ContentNegotiationTest.php
+1
-1
core/modules/system/lib/Drupal/system/Tests/Entity/ConfigEntityQueryTest.php
.../lib/Drupal/system/Tests/Entity/ConfigEntityQueryTest.php
+1
-1
core/modules/system/lib/Drupal/system/Tests/Entity/EntityQueryTest.php
...system/lib/Drupal/system/Tests/Entity/EntityQueryTest.php
+3
-3
core/modules/system/lib/Drupal/system/Tests/Plugin/Discovery/DiscoveryTestBase.php
...rupal/system/Tests/Plugin/Discovery/DiscoveryTestBase.php
+1
-1
core/modules/system/lib/Drupal/system/Tests/Routing/MatcherDumperTest.php
...tem/lib/Drupal/system/Tests/Routing/MatcherDumperTest.php
+1
-1
core/modules/system/lib/Drupal/system/Tests/Theme/ThemeTest.php
...odules/system/lib/Drupal/system/Tests/Theme/ThemeTest.php
+1
-1
core/modules/system/system.js
core/modules/system/system.js
+2
-2
core/modules/system/tests/modules/batch_test/lib/Drupal/batch_test/Controller/BatchTestController.php
.../lib/Drupal/batch_test/Controller/BatchTestController.php
+1
-1
core/modules/taxonomy/taxonomy.views.inc
core/modules/taxonomy/taxonomy.views.inc
+1
-1
core/modules/toolbar/js/toolbar.js
core/modules/toolbar/js/toolbar.js
+1
-1
core/modules/toolbar/toolbar.api.php
core/modules/toolbar/toolbar.api.php
+3
-3
core/modules/tour/js/tour.js
core/modules/tour/js/tour.js
+1
-1
core/modules/tour/lib/Drupal/tour/Tests/TourTestBase.php
core/modules/tour/lib/Drupal/tour/Tests/TourTestBase.php
+1
-1
core/modules/update/lib/Drupal/update/UpdateFetcher.php
core/modules/update/lib/Drupal/update/UpdateFetcher.php
+1
-1
core/modules/user/lib/Drupal/user/Entity/User.php
core/modules/user/lib/Drupal/user/Entity/User.php
+1
-1
core/modules/user/lib/Drupal/user/Tests/UserLoginTest.php
core/modules/user/lib/Drupal/user/Tests/UserLoginTest.php
+1
-1
core/modules/user/lib/Drupal/user/Tests/UserValidationTest.php
...modules/user/lib/Drupal/user/Tests/UserValidationTest.php
+3
-3
core/modules/views/lib/Drupal/views/Plugin/views/field/FieldPluginBase.php
...s/lib/Drupal/views/Plugin/views/field/FieldPluginBase.php
+2
-2
core/modules/views/lib/Drupal/views/Plugin/views/filter/FilterPluginBase.php
...lib/Drupal/views/Plugin/views/filter/FilterPluginBase.php
+2
-2
core/modules/views/lib/Drupal/views/Plugin/views/query/Sql.php
...modules/views/lib/Drupal/views/Plugin/views/query/Sql.php
+1
-1
core/modules/views/lib/Drupal/views/Plugin/views/style/StylePluginBase.php
...s/lib/Drupal/views/Plugin/views/style/StylePluginBase.php
+4
-3
core/modules/views/lib/Drupal/views/Tests/Handler/AreaTextTest.php
...les/views/lib/Drupal/views/Tests/Handler/AreaTextTest.php
+1
-1
core/modules/views/lib/Drupal/views/Tests/Handler/FieldUnitTest.php
...es/views/lib/Drupal/views/Tests/Handler/FieldUnitTest.php
+1
-1
core/modules/views/lib/Drupal/views/Tests/QueryGroupByTest.php
...modules/views/lib/Drupal/views/Tests/QueryGroupByTest.php
+1
-1
core/modules/views/lib/Drupal/views/Tests/ViewTestBase.php
core/modules/views/lib/Drupal/views/Tests/ViewTestBase.php
+1
-1
core/modules/views/lib/Drupal/views/ViewExecutable.php
core/modules/views/lib/Drupal/views/ViewExecutable.php
+1
-1
core/modules/views/tests/Drupal/views/Tests/ViewsDataTest.php
.../modules/views/tests/Drupal/views/Tests/ViewsDataTest.php
+6
-6
core/modules/views/views.api.php
core/modules/views/views.api.php
+1
-1
core/modules/views/views.module
core/modules/views/views.module
+1
-1
core/tests/Drupal/Tests/Core/Access/CsrfAccessCheckTest.php
core/tests/Drupal/Tests/Core/Access/CsrfAccessCheckTest.php
+2
-2
core/tests/Drupal/Tests/Core/Entity/Enhancer/EntityRouteEnhancerTest.php
...al/Tests/Core/Entity/Enhancer/EntityRouteEnhancerTest.php
+3
-3
core/themes/bartik/color/color.inc
core/themes/bartik/color/color.inc
+1
-1
No files found.
core/includes/bootstrap.inc
View file @
80fbd33d
...
@@ -2264,7 +2264,7 @@ function drupal_valid_test_ua($new_prefix = NULL) {
...
@@ -2264,7 +2264,7 @@ function drupal_valid_test_ua($new_prefix = NULL) {
// The file properties add more entropy not easily accessible to others.
// The file properties add more entropy not easily accessible to others.
$key
=
drupal_get_hash_salt
()
.
filectime
(
__FILE__
)
.
fileinode
(
__FILE__
);
$key
=
drupal_get_hash_salt
()
.
filectime
(
__FILE__
)
.
fileinode
(
__FILE__
);
$time_diff
=
REQUEST_TIME
-
$time
;
$time_diff
=
REQUEST_TIME
-
$time
;
// We cant use Crypt::hmacBase64() yet because this can be called in very
// We can
'
t use Crypt::hmacBase64() yet because this can be called in very
// early bootstrap when autoloader has not been initialized yet.
// early bootstrap when autoloader has not been initialized yet.
$test_hmac
=
base64_encode
(
hash_hmac
(
'sha256'
,
$check_string
,
$key
,
TRUE
));
$test_hmac
=
base64_encode
(
hash_hmac
(
'sha256'
,
$check_string
,
$key
,
TRUE
));
$test_hmac
=
strtr
(
$test_hmac
,
array
(
'+'
=>
'-'
,
'/'
=>
'_'
,
'='
=>
''
));
$test_hmac
=
strtr
(
$test_hmac
,
array
(
'+'
=>
'-'
,
'/'
=>
'_'
,
'='
=>
''
));
...
...
core/includes/common.inc
View file @
80fbd33d
...
@@ -624,7 +624,7 @@ function valid_url($url, $absolute = FALSE) {
...
@@ -624,7 +624,7 @@ function valid_url($url, $absolute = FALSE) {
* given step.
* given step.
*
*
* @return bool
* @return bool
* TRUE if no step mismatch has occured, or FALSE otherwise.
* TRUE if no step mismatch has occur
r
ed, or FALSE otherwise.
*
*
* @deprecated as of Drupal 8.0. Use
* @deprecated as of Drupal 8.0. Use
* \Drupal\Component\Utility\Number::validStep() directly instead
* \Drupal\Component\Utility\Number::validStep() directly instead
...
...
core/includes/install.core.inc
View file @
80fbd33d
...
@@ -1670,7 +1670,7 @@ function install_select_language_form($form, &$form_state, $files = array()) {
...
@@ -1670,7 +1670,7 @@ function install_select_language_form($form, &$form_state, $files = array()) {
*
*
* @return string
* @return string
* A themed status report, or an exception if there are requirement errors.
* A themed status report, or an exception if there are requirement errors.
* Upon successful
l
download the page is reloaded and no output is returned.
* Upon successful download the page is reloaded and no output is returned.
*/
*/
function
install_download_translation
(
&
$install_state
)
{
function
install_download_translation
(
&
$install_state
)
{
// Check whether all conditions are met to download. Download the translation
// Check whether all conditions are met to download. Download the translation
...
@@ -1680,7 +1680,7 @@ function install_download_translation(&$install_state) {
...
@@ -1680,7 +1680,7 @@ function install_download_translation(&$install_state) {
return
$output
;
return
$output
;
}
}
// The download was successful
l
, reload the page in the new lanagage.
// The download was successful, reload the page in the new lanagage.
install_goto
(
install_redirect_url
(
$install_state
));
install_goto
(
install_redirect_url
(
$install_state
));
}
}
...
@@ -2205,7 +2205,7 @@ function install_finished(&$install_state) {
...
@@ -2205,7 +2205,7 @@ function install_finished(&$install_state) {
// Will also trigger indexing of profile-supplied content or feeds.
// Will also trigger indexing of profile-supplied content or feeds.
drupal_cron_run
();
drupal_cron_run
();
// Save a snapshot of the intially installed configuration.
// Save a snapshot of the in
i
tially installed configuration.
$active
=
drupal_container
()
->
get
(
'config.storage'
);
$active
=
drupal_container
()
->
get
(
'config.storage'
);
$snapshot
=
drupal_container
()
->
get
(
'config.storage.snapshot'
);
$snapshot
=
drupal_container
()
->
get
(
'config.storage.snapshot'
);
config_import_create_snapshot
(
$active
,
$snapshot
);
config_import_create_snapshot
(
$active
,
$snapshot
);
...
...
core/lib/Drupal/Component/Annotation/Plugin.php
View file @
80fbd33d
...
@@ -23,7 +23,7 @@
...
@@ -23,7 +23,7 @@
class
Plugin
implements
AnnotationInterface
{
class
Plugin
implements
AnnotationInterface
{
/**
/**
* The plugin definiton read from the class annotation.
* The plugin definit
i
on read from the class annotation.
*
*
* @var array
* @var array
*/
*/
...
...
core/lib/Drupal/Component/Gettext/PoStreamReader.php
View file @
80fbd33d
...
@@ -247,11 +247,11 @@ private function readHeader() {
...
@@ -247,11 +247,11 @@ private function readHeader() {
* this line ends the current item, it is saved with setItemFromArray() with
* this line ends the current item, it is saved with setItemFromArray() with
* data from $this->_current_item.
* data from $this->_current_item.
*
*
* An internal state machine is maintained in this reader using
$this->_context
* An internal state machine is maintained in this reader using
*
as the reading state. PO items are inbetween COMMENT states (when items have
*
$this->_context as the reading state. PO items are in between COMMENT
*
at least one line or comment inbetween them or indicated by MSGSTR
or
*
states (when items have at least one line or comment in between them)
or
*
MSGSTR_ARR followed immediately by an MSGID or MSGCTXT (when items closely
*
indicated by MSGSTR or MSGSTR_ARR followed immediately by an MSGID or
* follow each other).
*
MSGCTXT (when items closely
follow each other).
*
*
* @return
* @return
* FALSE if an error was logged, NULL otherwise. The errors are considered
* FALSE if an error was logged, NULL otherwise. The errors are considered
...
...
core/lib/Drupal/Component/Plugin/PluginInspectionInterface.php
View file @
80fbd33d
...
@@ -9,7 +9,7 @@
...
@@ -9,7 +9,7 @@
/**
/**
* Plugin interface for providing some metadata inspection.
* Plugin interface for providing some metadata inspection.
*
*
* This interface provides some simple tools for code rec
ie
ving a plugin to
* This interface provides some simple tools for code rec
ei
ving a plugin to
* interact with the plugin system.
* interact with the plugin system.
*/
*/
interface
PluginInspectionInterface
{
interface
PluginInspectionInterface
{
...
...
core/lib/Drupal/Component/Utility/Number.php
View file @
80fbd33d
...
@@ -28,7 +28,7 @@ class Number {
...
@@ -28,7 +28,7 @@ class Number {
* given step.
* given step.
*
*
* @return bool
* @return bool
* TRUE if no step mismatch has occured, or FALSE otherwise.
* TRUE if no step mismatch has occur
r
ed, or FALSE otherwise.
*
*
* @see http://opensource.apple.com/source/WebCore/WebCore-1298/html/NumberInputType.cpp
* @see http://opensource.apple.com/source/WebCore/WebCore-1298/html/NumberInputType.cpp
*/
*/
...
...
core/lib/Drupal/Component/Utility/Unicode.php
View file @
80fbd33d
...
@@ -91,14 +91,14 @@ class Unicode {
...
@@ -91,14 +91,14 @@ class Unicode {
const
STATUS_ERROR
=
-
1
;
const
STATUS_ERROR
=
-
1
;
/**
/**
* Holds the multibyte capabilities of the current enviroment.
* Holds the multibyte capabilities of the current enviro
n
ment.
*
*
* @var int
* @var int
*/
*/
protected
static
$status
=
0
;
protected
static
$status
=
0
;
/**
/**
* Get the current status of unicode/multibyte support on this enviroment.
* Get the current status of unicode/multibyte support on this enviro
n
ment.
*
*
* @return int
* @return int
* The status of multibyte support. It can be one of:
* The status of multibyte support. It can be one of:
...
@@ -107,14 +107,14 @@ class Unicode {
...
@@ -107,14 +107,14 @@ class Unicode {
* - \Drupal\Component\Utility\Unicode::STATUS_SINGLEBYTE
* - \Drupal\Component\Utility\Unicode::STATUS_SINGLEBYTE
* Standard PHP (emulated) unicode support.
* Standard PHP (emulated) unicode support.
* - \Drupal\Component\Utility\Unicode::STATUS_ERROR
* - \Drupal\Component\Utility\Unicode::STATUS_ERROR
* An error occured. No unicode support.
* An error occur
r
ed. No unicode support.
*/
*/
public
static
function
getStatus
()
{
public
static
function
getStatus
()
{
return
static
::
$status
;
return
static
::
$status
;
}
}
/**
/**
* Sets the value for multibyte support status for the current enviroment.
* Sets the value for multibyte support status for the current enviro
n
ment.
*
*
* The following status keys are supported:
* The following status keys are supported:
* - \Drupal\Component\Utility\Unicode::STATUS_MULTIBYTE
* - \Drupal\Component\Utility\Unicode::STATUS_MULTIBYTE
...
@@ -122,7 +122,7 @@ public static function getStatus() {
...
@@ -122,7 +122,7 @@ public static function getStatus() {
* - \Drupal\Component\Utility\Unicode::STATUS_SINGLEBYTE
* - \Drupal\Component\Utility\Unicode::STATUS_SINGLEBYTE
* Standard PHP (emulated) unicode support.
* Standard PHP (emulated) unicode support.
* - \Drupal\Component\Utility\Unicode::STATUS_ERROR
* - \Drupal\Component\Utility\Unicode::STATUS_ERROR
* An error occured. No unicode support.
* An error occur
r
ed. No unicode support.
*
*
* @param int $status
* @param int $status
* The new status of multibyte support.
* The new status of multibyte support.
...
...
core/lib/Drupal/Component/Utility/Url.php
View file @
80fbd33d
...
@@ -232,8 +232,8 @@ public static function externalIsLocal($url, $base_url) {
...
@@ -232,8 +232,8 @@ public static function externalIsLocal($url, $base_url) {
}
}
else
{
else
{
// When comparing base paths, we need a trailing slash to make sure a
// When comparing base paths, we need a trailing slash to make sure a
// partial URL match isn't occur
ing. Since base_path() always returns with
// partial URL match isn't occur
ring. Since base_path() always returns
// a trailing slash, we don't need to add the trailing slash here.
//
with
a trailing slash, we don't need to add the trailing slash here.
return
(
$url_parts
[
'host'
]
==
$base_host
&&
stripos
(
$url_parts
[
'path'
],
$base_url
)
===
0
);
return
(
$url_parts
[
'host'
]
==
$base_host
&&
stripos
(
$url_parts
[
'path'
],
$base_url
)
===
0
);
}
}
}
}
...
...
core/lib/Drupal/Core/Asset/CssOptimizer.php
View file @
80fbd33d
...
@@ -110,7 +110,7 @@ public function loadFile($file, $optimize = NULL, $reset_basepath = TRUE) {
...
@@ -110,7 +110,7 @@ public function loadFile($file, $optimize = NULL, $reset_basepath = TRUE) {
$content
=
$this
->
processCss
(
$contents
,
$_optimize
);
$content
=
$this
->
processCss
(
$contents
,
$_optimize
);
}
}
// Restore the parent base path as the file and its childen are processed.
// Restore the parent base path as the file and its child
r
en are processed.
$basepath
=
$parent_base_path
;
$basepath
=
$parent_base_path
;
return
$content
;
return
$content
;
}
}
...
...
core/lib/Drupal/Core/Controller/ExceptionController.php
View file @
80fbd33d
...
@@ -268,7 +268,7 @@ public function on500Html(FlattenException $exception, Request $request) {
...
@@ -268,7 +268,7 @@ public function on500Html(FlattenException $exception, Request $request) {
}
}
/**
/**
* Processes an AccessDenied exception that occured on a JSON request.
* Processes an AccessDenied exception that occur
r
ed on a JSON request.
*
*
* @param Symfony\Component\HttpKernel\Exception\FlattenException $exception
* @param Symfony\Component\HttpKernel\Exception\FlattenException $exception
* The flattened exception.
* The flattened exception.
...
@@ -282,7 +282,7 @@ public function on403Json(FlattenException $exception, Request $request) {
...
@@ -282,7 +282,7 @@ public function on403Json(FlattenException $exception, Request $request) {
}
}
/**
/**
* Processes a NotFound exception that occured on a JSON request.
* Processes a NotFound exception that occur
r
ed on a JSON request.
*
*
* @param Symfony\Component\HttpKernel\Exception\FlattenException $exception
* @param Symfony\Component\HttpKernel\Exception\FlattenException $exception
* The flattened exception.
* The flattened exception.
...
@@ -296,7 +296,7 @@ public function on404Json(FlattenException $exception, Request $request) {
...
@@ -296,7 +296,7 @@ public function on404Json(FlattenException $exception, Request $request) {
}
}
/**
/**
* Processes a MethodNotAllowed exception that occured on a JSON request.
* Processes a MethodNotAllowed exception that occur
r
ed on a JSON request.
*
*
* @param Symfony\Component\HttpKernel\Exception\FlattenException $exception
* @param Symfony\Component\HttpKernel\Exception\FlattenException $exception
* The flattened exception.
* The flattened exception.
...
...
core/lib/Drupal/Core/Entity/Query/Sql/Tables.php
View file @
80fbd33d
...
@@ -169,7 +169,7 @@ public function addField($field, $type, $langcode) {
...
@@ -169,7 +169,7 @@ public function addField($field, $type, $langcode) {
else
{
else
{
// ensureEntityTable() decides whether an entity property will be
// ensureEntityTable() decides whether an entity property will be
// queried from the data table or the base table based on where it
// queried from the data table or the base table based on where it
// finds the property first. The data table is prefered, which is why
// finds the property first. The data table is prefer
r
ed, which is why
// it gets added before the base table.
// it gets added before the base table.
$entity_tables
=
array
();
$entity_tables
=
array
();
if
(
isset
(
$entity_info
[
'data_table'
]))
{
if
(
isset
(
$entity_info
[
'data_table'
]))
{
...
...
core/lib/Drupal/Core/EventSubscriber/SpecialAttributesRouteSubscriber.php
View file @
80fbd33d
...
@@ -52,7 +52,8 @@ protected function alterRoutes(RouteCollection $collection, $module) {
...
@@ -52,7 +52,8 @@ protected function alterRoutes(RouteCollection $collection, $module) {
* The route build event.
* The route build event.
*
*
* @return bool
* @return bool
* Returns TRUE if the variables were succesfully replaced, otherwise FALSE.
* Returns TRUE if the variables were successfully replaced, otherwise
* FALSE.
*/
*/
public
function
onAlterRoutes
(
RouteBuildEvent
$event
)
{
public
function
onAlterRoutes
(
RouteBuildEvent
$event
)
{
$collection
=
$event
->
getRouteCollection
();
$collection
=
$event
->
getRouteCollection
();
...
...
core/lib/Drupal/Core/Template/TwigEnvironment.php
View file @
80fbd33d
...
@@ -15,7 +15,7 @@
...
@@ -15,7 +15,7 @@
* Instances of this class are used to store the configuration and extensions,
* Instances of this class are used to store the configuration and extensions,
* and are used to load templates from the file system or other locations.
* and are used to load templates from the file system or other locations.
*
*
* @see core\vendor\twig\twig\lib\Twig\Envi
or
nment.php
* @see core\vendor\twig\twig\lib\Twig\Envi
ro
nment.php
*/
*/
class
TwigEnvironment
extends
\
Twig_Environment
{
class
TwigEnvironment
extends
\
Twig_Environment
{
protected
$cache_object
=
NULL
;
protected
$cache_object
=
NULL
;
...
...
core/misc/tableheader.js
View file @
80fbd33d
...
@@ -15,7 +15,7 @@ function scrollValue(position) {
...
@@ -15,7 +15,7 @@ function scrollValue(position) {
return
document
.
documentElement
[
position
]
||
document
.
body
[
position
];
return
document
.
documentElement
[
position
]
||
document
.
body
[
position
];
}
}
// Select and initilize sticky table headers.
// Select and initi
a
lize sticky table headers.
function
tableHeaderInitHandler
(
e
)
{
function
tableHeaderInitHandler
(
e
)
{
var
$tables
=
$
(
e
.
data
.
context
).
find
(
'
table.sticky-enabled
'
).
once
(
'
tableheader
'
);
var
$tables
=
$
(
e
.
data
.
context
).
find
(
'
table.sticky-enabled
'
).
once
(
'
tableheader
'
);
for
(
var
i
=
0
,
il
=
$tables
.
length
;
i
<
il
;
i
++
)
{
for
(
var
i
=
0
,
il
=
$tables
.
length
;
i
<
il
;
i
++
)
{
...
...
core/modules/ban/lib/Drupal/ban/EventSubscriber/BanSubscriber.php
View file @
80fbd33d
...
@@ -37,7 +37,7 @@ public function __construct(BanIpManager $manager) {
...
@@ -37,7 +37,7 @@ public function __construct(BanIpManager $manager) {
}
}
/**
/**
* Response with 403 if the visitor's IP adress is banned.
* Response with 403 if the visitor's IP ad
d
ress is banned.
*
*
* @param Symfony\Component\HttpKernel\Event\GetResponseEvent $event
* @param Symfony\Component\HttpKernel\Event\GetResponseEvent $event
* The Event to process.
* The Event to process.
...
...
core/modules/block/lib/Drupal/block/Tests/Views/DisplayBlockTest.php
View file @
80fbd33d
...
@@ -144,7 +144,7 @@ protected function testDeleteBlockDisplay() {
...
@@ -144,7 +144,7 @@ protected function testDeleteBlockDisplay() {
$block_storage_controller
=
$this
->
container
->
get
(
'entity.manager'
)
->
getStorageController
(
'block'
);
$block_storage_controller
=
$this
->
container
->
get
(
'entity.manager'
)
->
getStorageController
(
'block'
);
// Remove the block display, so both block entities from the first view
// Remove the block display, so both block entities from the first view
// should both dis
sa
pear.
// should both dis
ap
pear.
$view
=
views_get_view
(
'test_view_block'
);
$view
=
views_get_view
(
'test_view_block'
);
$view
->
initDisplay
();
$view
->
initDisplay
();
$view
->
displayHandlers
->
remove
(
'block_1'
);
$view
->
displayHandlers
->
remove
(
'block_1'
);
...
...
core/modules/content_translation/content_translation.module
View file @
80fbd33d
...
@@ -266,7 +266,7 @@ function content_translation_menu_alter(array &$items) {
...
@@ -266,7 +266,7 @@ function content_translation_menu_alter(array &$items) {
}
}
while
(
!
empty
(
$entity_form_item
[
'type'
])
&&
$entity_form_item
[
'type'
]
==
MENU_DEFAULT_LOCAL_TASK
);
while
(
!
empty
(
$entity_form_item
[
'type'
])
&&
$entity_form_item
[
'type'
]
==
MENU_DEFAULT_LOCAL_TASK
);
// Make the "Translate" tab follow the "Edit" one when possib
i
le.
// Make the "Translate" tab follow the "Edit" one when possible.
if
(
isset
(
$entity_form_item
[
'weight'
]))
{
if
(
isset
(
$entity_form_item
[
'weight'
]))
{
$items
[
"
$path
/translations"
][
'weight'
]
=
$entity_form_item
[
'weight'
]
+
0.01
;
$items
[
"
$path
/translations"
][
'weight'
]
=
$entity_form_item
[
'weight'
]
+
0.01
;
}
}
...
...
core/modules/datetime/lib/Drupal/datetime/DateHelper.php
View file @
80fbd33d
...
@@ -461,7 +461,7 @@ public static function daysInMonth($date = NULL) {
...
@@ -461,7 +461,7 @@ public static function daysInMonth($date = NULL) {
*
*
* @param mixed $date
* @param mixed $date
* (optional) A date object, timestamp, or a date string.
* (optional) A date object, timestamp, or a date string.
* Defaults to NULL, wh
ci
h means to use the current date.
* Defaults to NULL, wh
ic
h means to use the current date.
*
*
* @return int
* @return int
* The number of days in the year.
* The number of days in the year.
...
@@ -506,7 +506,7 @@ public static function dayOfWeek($date = NULL) {
...
@@ -506,7 +506,7 @@ public static function dayOfWeek($date = NULL) {
*
*
* @param mixed $date
* @param mixed $date
* (optional) A date object, timestamp, or a date string.
* (optional) A date object, timestamp, or a date string.
* Defaults to NULL, wh
ci
h means use the current date.
* Defaults to NULL, wh
ic
h means use the current date.
* @param string $abbr
* @param string $abbr
* (optional) Whether to return the abbreviated name for that day.
* (optional) Whether to return the abbreviated name for that day.
* Defaults to TRUE.
* Defaults to TRUE.
...
...
core/modules/dblog/lib/Drupal/dblog/Tests/DbLogTest.php
View file @
80fbd33d
...
@@ -24,7 +24,7 @@ class DbLogTest extends WebTestBase {
...
@@ -24,7 +24,7 @@ class DbLogTest extends WebTestBase {
public
static
$modules
=
array
(
'dblog'
,
'node'
,
'forum'
,
'help'
);
public
static
$modules
=
array
(
'dblog'
,
'node'
,
'forum'
,
'help'
);
/**
/**
* A user with some relev
e
nt administrative permissions.
* A user with some relev
a
nt administrative permissions.
*
*
* @var object
* @var object
*/
*/
...
...
core/modules/edit/js/models/FieldModel.js
View file @
80fbd33d
...
@@ -156,9 +156,9 @@ Drupal.edit.FieldModel = Backbone.Model.extend({
...
@@ -156,9 +156,9 @@ Drupal.edit.FieldModel = Backbone.Model.extend({
// - Trigger: user.
// - Trigger: user.
// - Guarantees: see 'candidate' and 'active'.
// - Guarantees: see 'candidate' and 'active'.
// - Expected behavior: saving indicator, in-place editor is saving field
// - Expected behavior: saving indicator, in-place editor is saving field
// data into TempStore. Upon succes
ful saving (without validation errors),
// data into TempStore. Upon succes
sful saving (without validation
//
the in-place editor transitions the field's state to 'saved', but to
//
errors), the in-place editor transitions the field's state to 'saved',
// 'invalid' upon failed saving (with validation errors).
//
but to
'invalid' upon failed saving (with validation errors).
'
saving
'
,
'
saving
'
,
// In-place editor has successfully saved the changed field.
// In-place editor has successfully saved the changed field.
// - Trigger: in-place editor.
// - Trigger: in-place editor.
...
...
core/modules/edit/js/views/EditorView.js
View file @
80fbd33d
...
@@ -74,7 +74,7 @@ Drupal.edit.EditorView = Backbone.View.extend({
...
@@ -74,7 +74,7 @@ Drupal.edit.EditorView = Backbone.View.extend({
* insert its own toolbar UI into Edit's tightly integrated toolbar.
* insert its own toolbar UI into Edit's tightly integrated toolbar.
* - Boolean fullWidthToolbar: indicates whether Edit's tightly integrated
* - Boolean fullWidthToolbar: indicates whether Edit's tightly integrated
* toolbar should consume the full width of the element, rather than being
* toolbar should consume the full width of the element, rather than being
* just long enough to accomodate a label.
* just long enough to accom
m
odate a label.
*/
*/
getEditUISettings
:
function
()
{
getEditUISettings
:
function
()
{
return
{
padding
:
false
,
unifiedToolbar
:
false
,
fullWidthToolbar
:
false
,
popup
:
false
};
return
{
padding
:
false
,
unifiedToolbar
:
false
,
fullWidthToolbar
:
false
,
popup
:
false
};
...
...
core/modules/file/lib/Drupal/file/Tests/DownloadTest.php
View file @
80fbd33d
...
@@ -68,7 +68,7 @@ function testPrivateFileTransfer() {
...
@@ -68,7 +68,7 @@ function testPrivateFileTransfer() {
$this
->
assertEqual
(
$headers
[
'x-foo'
],
'Bar'
,
'Found header set by file_test module on private download.'
);
$this
->
assertEqual
(
$headers
[
'x-foo'
],
'Bar'
,
'Found header set by file_test module on private download.'
);
$this
->
assertResponse
(
200
,
'Correctly allowed access to a file when file_test provides headers.'
);
$this
->
assertResponse
(
200
,
'Correctly allowed access to a file when file_test provides headers.'
);
// Test that the file transfered correctly.
// Test that the file transfer
r
ed correctly.
$this
->
assertEqual
(
$contents
,
$this
->
content
,
'Contents of the file are correct.'
);
$this
->
assertEqual
(
$contents
,
$this
->
content
,
'Contents of the file are correct.'
);
// Deny access to all downloads via a -1 header.
// Deny access to all downloads via a -1 header.
...
...
core/modules/image/lib/Drupal/image/Tests/ImageStylesPathAndUrlTest.php
View file @
80fbd33d
...
@@ -143,10 +143,10 @@ function doImageStyleUrlAndPathTests($scheme, $clean_url = TRUE, $extra_slash =
...
@@ -143,10 +143,10 @@ function doImageStyleUrlAndPathTests($scheme, $clean_url = TRUE, $extra_slash =
}
}
// Add some extra chars to the token.
// Add some extra chars to the token.
$this
->
drupalGet
(
str_replace
(
IMAGE_DERIVATIVE_TOKEN
.
'='
,
IMAGE_DERIVATIVE_TOKEN
.
'=Zo'
,
$generate_url
));
$this
->
drupalGet
(
str_replace
(
IMAGE_DERIVATIVE_TOKEN
.
'='
,
IMAGE_DERIVATIVE_TOKEN
.
'=Zo'
,
$generate_url
));
$this
->
assertResponse
(
403
,
'Image was inaccessible at the URL wih an invalid token.'
);
$this
->
assertResponse
(
403
,
'Image was inaccessible at the URL wi
t
h an invalid token.'
);
// Change the parameter name so the token is missing.
// Change the parameter name so the token is missing.
$this
->
drupalGet
(
str_replace
(
IMAGE_DERIVATIVE_TOKEN
.
'='
,
'wrongparam='
,
$generate_url
));
$this
->
drupalGet
(
str_replace
(
IMAGE_DERIVATIVE_TOKEN
.
'='
,
'wrongparam='
,
$generate_url
));
$this
->
assertResponse
(
403
,
'Image was inaccessible at the URL wih a missing token.'
);
$this
->
assertResponse
(
403
,
'Image was inaccessible at the URL wi
t
h a missing token.'
);
// Check that the generated URL is the same when we pass in a relative path
// Check that the generated URL is the same when we pass in a relative path
// rather than a URI. We need to temporarily switch the default scheme to
// rather than a URI. We need to temporarily switch the default scheme to
...
@@ -205,7 +205,7 @@ function doImageStyleUrlAndPathTests($scheme, $clean_url = TRUE, $extra_slash =
...
@@ -205,7 +205,7 @@ function doImageStyleUrlAndPathTests($scheme, $clean_url = TRUE, $extra_slash =
elseif
(
$clean_url
)
{
elseif
(
$clean_url
)
{
// Add some extra chars to the token.
// Add some extra chars to the token.
$this
->
drupalGet
(
str_replace
(
IMAGE_DERIVATIVE_TOKEN
.
'='
,
IMAGE_DERIVATIVE_TOKEN
.
'=Zo'
,
$generate_url
));
$this
->
drupalGet
(
str_replace
(
IMAGE_DERIVATIVE_TOKEN
.
'='
,
IMAGE_DERIVATIVE_TOKEN
.
'=Zo'
,
$generate_url
));
$this
->
assertResponse
(
200
,
'Existing image was accessible at the URL wih an invalid token.'
);
$this
->
assertResponse
(
200
,
'Existing image was accessible at the URL wi
t
h an invalid token.'
);
}
}
// Allow insecure image derivatives to be created for the remainder of this
// Allow insecure image derivatives to be created for the remainder of this
...
...
core/modules/language/language.negotiation.inc
View file @
80fbd33d
...
@@ -134,9 +134,9 @@ function language_from_browser($languages) {
...
@@ -134,9 +134,9 @@ function language_from_browser($languages) {
foreach
(
$browser_langcodes
as
$langcode
=>
$qvalue
)
{
foreach
(
$browser_langcodes
as
$langcode
=>
$qvalue
)
{
// For Chinese languages the generic tag is either zh-hans or zh-hant, so we
// For Chinese languages the generic tag is either zh-hans or zh-hant, so we
// need to handle this separately, we can not split $langcode on the
// need to handle this separately, we can not split $langcode on the
// first occurence of '-' otherwise we get a non-existing language zh.
// first occur
r
ence of '-' otherwise we get a non-existing language zh.
// All other languages use a langcode without a '-', so we can safely split
// All other languages use a langcode without a '-', so we can safely split
// on the first occurence of it.
// on the first occur
r
ence of it.
$generic_tag
=
''
;
$generic_tag
=
''
;
if
(
strlen
(
$langcode
)
>
7
&&
(
substr
(
$langcode
,
0
,
7
)
==
'zh-hant'
||
substr
(
$langcode
,
0
,
7
)
==
'zh-hans'
))
{
if
(
strlen
(
$langcode
)
>
7
&&
(
substr
(
$langcode
,
0
,
7
)
==
'zh-hant'
||
substr
(
$langcode
,
0
,
7
)
==
'zh-hans'
))
{
$generic_tag
=
substr
(
$langcode
,
0
,
7
);
$generic_tag
=
substr
(
$langcode
,
0
,
7
);
...
...
core/modules/language/lib/Drupal/language/Tests/LanguageBrowserDetectionUnitTest.php
View file @
80fbd33d
...
@@ -33,7 +33,7 @@ public static function getInfo() {
...
@@ -33,7 +33,7 @@ public static function getInfo() {
function
testLanguageFromBrowser
()
{
function
testLanguageFromBrowser
()
{
// The order of the languages is only important if the browser language
// The order of the languages is only important if the browser language
// codes are having the same qvalue, otherwise the one with the highest
// codes are having the same qvalue, otherwise the one with the highest
// qvalue is prefered. The automatically generated generic tags are always
// qvalue is prefer
r
ed. The automatically generated generic tags are always
// having a lower qvalue.
// having a lower qvalue.
$languages
=
array
(
$languages
=
array
(
...
@@ -77,7 +77,7 @@ function testLanguageFromBrowser() {
...
@@ -77,7 +77,7 @@ function testLanguageFromBrowser() {
);
);
$test_cases
=
array
(
$test_cases
=
array
(
// Equal qvalue for each language, choose the site prefered one.
// Equal qvalue for each language, choose the site prefer
r
ed one.
'en,en-US,fr-CA,fr,es-MX'
=>
'en'
,
'en,en-US,fr-CA,fr,es-MX'
=>
'en'
,
'en-US,en,fr-CA,fr,es-MX'
=>
'en'
,
'en-US,en,fr-CA,fr,es-MX'
=>
'en'
,
'fr,en'
=>
'en'
,
'fr,en'
=>
'en'
,
...
...
core/modules/locale/lib/Drupal/locale/Tests/LocaleImportFunctionalTest.php
View file @
80fbd33d
...
@@ -151,7 +151,7 @@ function testStandalonePoFile() {
...
@@ -151,7 +151,7 @@ function testStandalonePoFile() {
// The database should now contain 6 customized strings (two imported
// The database should now contain 6 customized strings (two imported
// strings are not translated).
// strings are not translated).
$count
=
db_query
(
'SELECT lid FROM {locales_target} WHERE customized = :custom'
,
array
(
':custom'
=>
1
))
->
rowCount
();
$count
=
db_query
(
'SELECT lid FROM {locales_target} WHERE customized = :custom'
,
array
(
':custom'
=>
1
))
->
rowCount
();
$this
->
assertEqual
(
$count
,
6
,
'Customized translations succesfully imported.'
);
$this
->
assertEqual
(
$count
,
6
,
'Customized translations succes
s
fully imported.'
);
// Try importing a .po file with overriding strings, and ensure existing
// Try importing a .po file with overriding strings, and ensure existing
// customized strings are kept.
// customized strings are kept.
...
...
core/modules/locale/locale.admin.js
View file @
80fbd33d
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
"
use strict
"
;
"
use strict
"
;
/**
/**
* Mark
e
s changes of translations
* Marks changes of translations
*/
*/
Drupal
.
behaviors
.
localeTranslateDirty
=
{
Drupal
.
behaviors
.
localeTranslateDirty
=
{
attach
:
function
()
{
attach
:
function
()
{
...
...
core/modules/locale/locale.batch.inc
View file @
80fbd33d
...
@@ -87,7 +87,7 @@ function locale_translation_batch_status_check($project, $langcode, $options = a
...
@@ -87,7 +87,7 @@ function locale_translation_batch_status_check($project, $langcode, $options = a
* Batch finished callback: Set result message.
* Batch finished callback: Set result message.
*
*
* @param boolean $success
* @param boolean $success
* TRUE if batch succesfully completed.
* TRUE if batch succes
s
fully completed.
* @param array $results
* @param array $results
* Batch results.
* Batch results.
*/
*/
...
@@ -185,7 +185,7 @@ function locale_translation_batch_fetch_import($project, $langcode, $options, &$
...
@@ -185,7 +185,7 @@ function locale_translation_batch_fetch_import($project, $langcode, $options, &$
// The import is finished.