fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-07 02:31:40 +09:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop' of github.com:xpressengine/xe-core into develop

Browse source
This commit is contained in:
bnu 2015-04-13 14:01:40 +09:00
commit 6653c29f3e
6 changed files with 14 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

23
classes/db/DB.class.php
View file

@ -166,7 +166,7 @@ class DB
* leve of transaction
* @var unknown
*/
private $transationNestedLevel = 0;
private $transactionNestedLevel = 0;
/**
* returns instance of certain db type
@ -314,11 +314,6 @@ class DB
{
$db_type = $supported_list[$i];
if(version_compare(phpversion(), '5.0') < 0 && preg_match('/pdo/i', $db_type))
{
continue;
}
$class_name = sprintf("DB%s%s", strtoupper(substr($db_type, 0, 1)), strtolower(substr($db_type, 1)));
$class_file = sprintf(_XE_PATH_ . "classes/db/%s.class.php", $class_name);
if(!file_exists($class_file))
@ -1142,10 +1137,10 @@ class DB
return;
}
if($this->_begin($this->transationNestedLevel))
if($this->_begin($this->transactionNestedLevel))
{
$this->transaction_started = TRUE;
$this->transationNestedLevel++;
$this->transactionNestedLevel++;
}
}
@ -1169,11 +1164,11 @@ class DB
{
return;
}
if($this->_rollback($this->transationNestedLevel))
if($this->_rollback($this->transactionNestedLevel))
{
$this->transationNestedLevel--;
$this->transactionNestedLevel--;
if(!$this->transationNestedLevel)
if(!$this->transactionNestedLevel)
{
$this->transaction_started = FALSE;
}
@ -1201,14 +1196,14 @@ class DB
{
return;
}
if($this->transationNestedLevel == 1 && $this->_commit())
if($this->transactionNestedLevel == 1 && $this->_commit())
{
$this->transaction_started = FALSE;
$this->transationNestedLevel = 0;
$this->transactionNestedLevel = 0;
}
else
{
$this->transationNestedLevel--;
$this->transactionNestedLevel--;
}
}

9
classes/mail/Mail.class.php
View file

@ -1,14 +1,7 @@
<?php
/* Copyright (C) NAVER <http://www.navercorp.com> */
if(version_compare(PHP_VERSION, '5.0.0', '>='))
{
require_once _XE_PATH_ . "libs/phpmailer/phpmailer.php";
}
else
{
require_once _XE_PATH_ . "libs/phpmailer/class.phpmailer.php";
}
require_once _XE_PATH_ . "libs/phpmailer/phpmailer.php";
/**
* Mailing class for XpressEngine

2
classes/security/Password.class.php
View file

@ -111,7 +111,7 @@ class Password
case 'pbkdf2':
$iterations = pow(2, $this->getWorkFactor() + 5);
$salt = $this->createSecureSalt(12);
$salt = $this->createSecureSalt(12, 'alnum');
$hash = base64_encode($this->pbkdf2($password, $salt, 'sha256', $iterations, 24));
return 'sha256:'.sprintf('%07d', $iterations).':'.$salt.':'.$hash;

7
layouts/xedition/layout.html
View file

@ -297,13 +297,6 @@
<!--@if($_sample_slide)-->
<include target="./demo/slide.html" />
<!--@else-->
<div data-src="{$layout_info->slide_img1}">
<div class="camera_caption fadeIn">
<div class="camera_caption_wrap">
설정되지 않음
</div>
</div>
</div>
<div cond="$layout_info->slide_img1" data-src="{$layout_info->slide_img1}">
<div cond="$layout_info->slide_text1" class="camera_caption fadeIn">
<div class="camera_caption_wrap">

2
modules/editor/tpl/js/editor.app.js
View file

@ -65,6 +65,8 @@
this.editor_sequence = data.editorSequence;
$form.attr('editor_sequence', data.editorSequence);
if(CKEDITOR.env.mobile) CKEDITOR.env.isCompatible = true;
var instance = CKEDITOR.appendTo($containerEl[0], {}, $contentField.val());

2
modules/member/queries/chkAuthMail.xml
View file

@ -1,4 +1,4 @@
<query id="getAuthMail" action="select">
<query id="chkAuthMail" action="select">
<tables>
<table name="member_auth_mail" />
</tables>