This commit is contained in:
joyqi 2014-02-09 01:18:31 +08:00
parent 4ddd293f3d
commit fdf9196d58
2 changed files with 2 additions and 2 deletions

View File

@ -28,7 +28,7 @@ include 'header.php';
<input type="hidden" name="referer" value="<?php echo htmlspecialchars($request->get('referer')); ?>" />
</p>
<p>
<label for="remember"><input type="checkbox" name="remember" class="checkbox" value="1" id="remember" /> <?php _e('记住我'); ?></label>
<label for="remember"><input type="checkbox" name="remember" class="checkbox" value="1" id="remember" /> <?php _e('下次自动登录'); ?></label>
</p>
</form>

View File

@ -528,7 +528,7 @@ class Json
{
if (function_exists('json_decode')) {
/** from php 5.1 */
$result = json_decode($var);
return json_decode($var, $assoc);
} else {
$result = self::_decode($var);
}