mirror-fastadminnet/framework
1
0
Fork 0
mirror of https://gitee.com/fastadminnet/framework.git synced 2026-07-07 07:12:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/top-think/think

Browse Source
This commit is contained in:
thinkphp
2016-02-02 00:03:42 +08:00
parent ac7eafe9e8 f03c662712
commit 97166efd34
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
library/think/Url.php
View File

@@ -158,7 +158,7 @@ class Url
} }
} }
} else { } else {
$domain = $domain . (strpos($domain, '.') ? '' : strstr($_SERVER['HTTP_HOST'], '.')); $domain .= strpos($domain, '.') ? '' : strstr($_SERVER['HTTP_HOST'], '.');
} }
$domain = (self::isSsl() ? 'https://' : 'http://') . $domain; $domain = (self::isSsl() ? 'https://' : 'http://') . $domain;
} else { } else {

2
library/think/console/input/Definition.php
View File

@@ -361,7 +361,7 @@ class Definition
if (!$argument->isRequired()) { if (!$argument->isRequired()) {
$element = '[' . $element . ']'; $element = '[' . $element . ']';
} elseif ($argument->isArray()) { } elseif ($argument->isArray()) {
$element = $element . ' (' . $element . ')'; $element .= ' (' . $element . ')';
} }
if ($argument->isArray()) { if ($argument->isArray()) {

2
library/think/db/Driver.php
View File

@@ -668,7 +668,7 @@ abstract class Driver
$count = count($val); $count = count($val);
$rule = isset($val[$count - 1]) ? (is_array($val[$count - 1]) ? strtoupper($val[$count - 1][0]) : strtoupper($val[$count - 1])) : ''; $rule = isset($val[$count - 1]) ? (is_array($val[$count - 1]) ? strtoupper($val[$count - 1][0]) : strtoupper($val[$count - 1])) : '';
if (in_array($rule, ['AND', 'OR', 'XOR'])) { if (in_array($rule, ['AND', 'OR', 'XOR'])) {
$count = $count - 1; --$count;
} else { } else {
$rule = 'AND'; $rule = 'AND';
} }

4
library/traits/model/Auto.php
View File

@@ -182,7 +182,7 @@ trait Auto
} elseif (is_array($auto[2])) { } elseif (is_array($auto[2])) {
$flags = 0; $flags = 0;
foreach ($auto[2] as $v) { foreach ($auto[2] as $v) {
$flags = $flags | 1 << ($v - 1); $flags |= 1 << ($v - 1);
} }
} else { } else {
$flags = 3 == $auto[2] ? 3 : 1 << ($auto[2] - 1); $flags = 3 == $auto[2] ? 3 : 1 << ($auto[2] - 1);
@@ -302,7 +302,7 @@ trait Auto
} elseif (is_array($val[5])) { } elseif (is_array($val[5])) {
$flags = 0; $flags = 0;
foreach ($val[5] as $v) { foreach ($val[5] as $v) {
$flags = $flags | 1 << ($v - 1); $flags |= 1 << ($v - 1);
} }
} else { } else {
$flags = 3 == $val[5] ? 3 : 1 << ($val[5] - 1); $flags = 3 == $val[5] ? 3 : 1 << ($val[5] - 1);