php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-08-14 22:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed wrong case in method calls

Browse Source
This commit is contained in:
Alexander Makarov
2016-02-16 13:53:53 +03:00
parent 608479dc53
commit 97bc4e0567
5 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
framework/caching/MemCache.php
View File

@ -179,7 +179,7 @@ class MemCache extends Cache
// $timeout is used for memcache versions that do not have $timeoutms parameter // $timeout is used for memcache versions that do not have $timeoutms parameter
$timeout = (int) ($server->timeout / 1000) + (($server->timeout % 1000 > 0) ? 1 : 0); $timeout = (int) ($server->timeout / 1000) + (($server->timeout % 1000 > 0) ? 1 : 0);
if ($paramCount === 9) { if ($paramCount === 9) {
$cache->addServer( $cache->addserver(
$server->host, $server->host,
$server->port, $server->port,
$server->persistent, $server->persistent,
@ -191,7 +191,7 @@ class MemCache extends Cache
$server->timeout $server->timeout
); );
} else { } else {
$cache->addServer( $cache->addserver(
$server->host, $server->host,
$server->port, $server->port,
$server->persistent, $server->persistent,

2
framework/console/controllers/HelpController.php
View File

@ -129,7 +129,7 @@ class HelpController extends Controller
*/ */
protected function getModuleCommands($module) protected function getModuleCommands($module)
{ {
$prefix = $module instanceof Application ? '' : $module->getUniqueID() . '/'; $prefix = $module instanceof Application ? '' : $module->getUniqueId() . '/';
$commands = []; $commands = [];
foreach (array_keys($module->controllerMap) as $id) { foreach (array_keys($module->controllerMap) as $id) {

2
framework/filters/HttpCache.php
View File

@ -152,7 +152,7 @@ class HttpCache extends ActionFilter
if (isset($_SERVER['HTTP_IF_NONE_MATCH'])) { if (isset($_SERVER['HTTP_IF_NONE_MATCH'])) {
// HTTP_IF_NONE_MATCH takes precedence over HTTP_IF_MODIFIED_SINCE // HTTP_IF_NONE_MATCH takes precedence over HTTP_IF_MODIFIED_SINCE
// http://tools.ietf.org/html/rfc7232#section-3.3 // http://tools.ietf.org/html/rfc7232#section-3.3
return $etag !== null && in_array($etag, Yii::$app->request->getEtags(), true); return $etag !== null && in_array($etag, Yii::$app->request->getETags(), true);
} elseif (isset($_SERVER['HTTP_IF_MODIFIED_SINCE'])) { } elseif (isset($_SERVER['HTTP_IF_MODIFIED_SINCE'])) {
return $lastModified !== null && @strtotime($_SERVER['HTTP_IF_MODIFIED_SINCE']) >= $lastModified; return $lastModified !== null && @strtotime($_SERVER['HTTP_IF_MODIFIED_SINCE']) >= $lastModified;
} else { } else {

2
framework/grid/CheckboxColumn.php
View File

@ -112,7 +112,7 @@ class CheckboxColumn extends Column
if ($this->header !== null || !$this->multiple) { if ($this->header !== null || !$this->multiple) {
return parent::renderHeaderCellContent(); return parent::renderHeaderCellContent();
} else { } else {
return Html::checkBox($name, false, ['class' => 'select-on-check-all']); return Html::checkbox($name, false, ['class' => 'select-on-check-all']);
} }
} }

4
framework/rbac/migrations/m140506_102106_rbac_init.php
View File

@ -91,7 +91,7 @@ class m140506_102106_rbac_init extends \yii\db\Migration
'FOREIGN KEY (item_name) REFERENCES ' . $authManager->itemTable . ' (name) ON DELETE CASCADE ON UPDATE CASCADE', 'FOREIGN KEY (item_name) REFERENCES ' . $authManager->itemTable . ' (name) ON DELETE CASCADE ON UPDATE CASCADE',
], $tableOptions); ], $tableOptions);
if($this->isMsSQL()) { if($this->isMSSQL()) {
$this->execute("CREATE TRIGGER dbo.trigger_auth_item_child $this->execute("CREATE TRIGGER dbo.trigger_auth_item_child
ON dbo.{$authManager->itemTable} ON dbo.{$authManager->itemTable}
INSTEAD OF DELETE, UPDATE INSTEAD OF DELETE, UPDATE
@ -137,7 +137,7 @@ class m140506_102106_rbac_init extends \yii\db\Migration
$authManager = $this->getAuthManager(); $authManager = $this->getAuthManager();
$this->db = $authManager->db; $this->db = $authManager->db;
if($this->isMsSQL()) { if($this->isMSSQL()) {
$this->execute('DROP dbo.trigger_auth_item_child;'); $this->execute('DROP dbo.trigger_auth_item_child;');
} }