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

Fix incompatible signatures of inherited methods

Browse source
This commit is contained in:
Kijin Sung 2015-12-08 14:07:42 +09:00
parent f6c226a0b7
commit 6473115ed3
9 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1094,7 +1094,7 @@ class DB
* this method is protected * this method is protected
* @return boolean * @return boolean
*/ */
function _begin() function _begin($transactionLevel = 0)
{ {
return TRUE; return TRUE;
} }
@ -1122,7 +1122,7 @@ class DB
* this method is protected * this method is protected
* @return boolean * @return boolean
*/ */
function _rollback() function _rollback($transactionLevel = 0)
{ {
return TRUE; return TRUE;
} }

4
classes/db/DBCubrid.class.php
View file

@ -144,7 +144,7 @@ class DBCubrid extends DB
* this method is private * this method is private
* @return boolean * @return boolean
*/ */
function _begin($transactionLevel) function _begin($transactionLevel = 0)
{ {
if(__CUBRID_VERSION__ >= '8.4.0') if(__CUBRID_VERSION__ >= '8.4.0')
{ {
@ -167,7 +167,7 @@ class DBCubrid extends DB
* this method is private * this method is private
* @return boolean * @return boolean
*/ */
function _rollback($transactionLevel) function _rollback($transactionLevel = 0)
{ {
$connection = $this->_getConnection('master'); $connection = $this->_getConnection('master');

4
classes/db/DBMssql.class.php
View file

@ -113,7 +113,7 @@ class DBMssql extends DB
* this method is private * this method is private
* @return boolean * @return boolean
*/ */
function _begin($transactionLevel) function _begin($transactionLevel = 0)
{ {
$connection = $this->_getConnection('master'); $connection = $this->_getConnection('master');
@ -136,7 +136,7 @@ class DBMssql extends DB
* this method is private * this method is private
* @return boolean * @return boolean
*/ */
function _rollback($transactionLevel) function _rollback($transactionLevel = 0)
{ {
$connection = $this->_getConnection('master'); $connection = $this->_getConnection('master');

4
classes/db/DBMysql.class.php
View file

@ -147,7 +147,7 @@ class DBMysql extends DB
* this method is private * this method is private
* @return boolean * @return boolean
*/ */
function _begin() function _begin($transactionLevel = 0)
{ {
return true; return true;
} }
@ -157,7 +157,7 @@ class DBMysql extends DB
* this method is private * this method is private
* @return boolean * @return boolean
*/ */
function _rollback() function _rollback($transactionLevel = 0)
{ {
return true; return true;
} }

4
classes/db/DBMysql_innodb.class.php
View file

@ -51,7 +51,7 @@ class DBMysql_innodb extends DBMysql
* this method is private * this method is private
* @return boolean * @return boolean
*/ */
function _begin($transactionLevel) function _begin($transactionLevel = 0)
{ {
$connection = $this->_getConnection('master'); $connection = $this->_getConnection('master');
@ -71,7 +71,7 @@ class DBMysql_innodb extends DBMysql
* this method is private * this method is private
* @return boolean * @return boolean
*/ */
function _rollback($transactionLevel) function _rollback($transactionLevel = 0)
{ {
$connection = $this->_getConnection('master'); $connection = $this->_getConnection('master');

4
classes/db/DBMysqli_innodb.class.php
View file

@ -85,7 +85,7 @@ class DBMysqli_innodb extends DBMysql
* this method is private * this method is private
* @return boolean * @return boolean
*/ */
function _begin($transactionLevel) function _begin($transactionLevel = 0)
{ {
$connection = $this->_getConnection('master'); $connection = $this->_getConnection('master');
@ -105,7 +105,7 @@ class DBMysqli_innodb extends DBMysql
* this method is private * this method is private
* @return boolean * @return boolean
*/ */
function _rollback($transactionLevel) function _rollback($transactionLevel = 0)
{ {
$connection = $this->_getConnection('master'); $connection = $this->_getConnection('master');

4
classes/module/ModuleObject.class.php
View file

@ -86,7 +86,7 @@ class ModuleObject extends Object
* @param string $type type of message (error, info, update) * @param string $type type of message (error, info, update)
* @return void * @return void
* */ * */
function setMessage($message, $type = NULL) function setMessage($message = 'success', $type = NULL)
{ {
parent::setMessage($message); parent::setMessage($message);
$this->setMessageType($type); $this->setMessageType($type);
@ -370,7 +370,7 @@ class ModuleObject extends Object
* set the directory path of the layout directory * set the directory path of the layout directory
* @return string * @return string
* */ * */
function getLayoutPath() function getLayoutPath($layout_name = "", $layout_type = "P")
{ {
return $this->layout_path; return $this->layout_path;
} }

2
classes/object/Object.class.php
View file

@ -94,7 +94,7 @@ class Object
* @param string $message Error message * @param string $message Error message
* @return bool Alaways returns true. * @return bool Alaways returns true.
*/ */
function setMessage($message = 'success') function setMessage($message = 'success', $type = NULL)
{ {
if($str = Context::getLang($message)) if($str = Context::getLang($message))
{ {

2
modules/layout/layout.model.php
View file

@ -289,7 +289,7 @@ class layoutModel extends layout
* @param string $layout_type (P : PC, M : Mobile) * @param string $layout_type (P : PC, M : Mobile)
* @return string path of layout * @return string path of layout
*/ */
function getLayoutPath($layout_name, $layout_type = "P") function getLayoutPath($layout_name = "", $layout_type = "P")
{ {
$layout_parse = explode('|@|', $layout_name); $layout_parse = explode('|@|', $layout_name);
if(count($layout_parse) > 1) if(count($layout_parse) > 1)