From 6473115ed333d21bbfc6768dc1fb2bff720fe6e9 Mon Sep 17 00:00:00 2001 From: Kijin Sung Date: Tue, 8 Dec 2015 14:07:42 +0900 Subject: [PATCH] Fix incompatible signatures of inherited methods --- classes/db/DB.class.php | 4 ++-- classes/db/DBCubrid.class.php | 4 ++-- classes/db/DBMssql.class.php | 4 ++-- classes/db/DBMysql.class.php | 4 ++-- classes/db/DBMysql_innodb.class.php | 4 ++-- classes/db/DBMysqli_innodb.class.php | 4 ++-- classes/module/ModuleObject.class.php | 4 ++-- classes/object/Object.class.php | 2 +- modules/layout/layout.model.php | 2 +- 9 files changed, 16 insertions(+), 16 deletions(-) diff --git a/classes/db/DB.class.php b/classes/db/DB.class.php index 02dcd1be4..b54099b82 100644 --- a/classes/db/DB.class.php +++ b/classes/db/DB.class.php @@ -1094,7 +1094,7 @@ class DB * this method is protected * @return boolean */ - function _begin() + function _begin($transactionLevel = 0) { return TRUE; } @@ -1122,7 +1122,7 @@ class DB * this method is protected * @return boolean */ - function _rollback() + function _rollback($transactionLevel = 0) { return TRUE; } diff --git a/classes/db/DBCubrid.class.php b/classes/db/DBCubrid.class.php index fc977d81a..546495d53 100644 --- a/classes/db/DBCubrid.class.php +++ b/classes/db/DBCubrid.class.php @@ -144,7 +144,7 @@ class DBCubrid extends DB * this method is private * @return boolean */ - function _begin($transactionLevel) + function _begin($transactionLevel = 0) { if(__CUBRID_VERSION__ >= '8.4.0') { @@ -167,7 +167,7 @@ class DBCubrid extends DB * this method is private * @return boolean */ - function _rollback($transactionLevel) + function _rollback($transactionLevel = 0) { $connection = $this->_getConnection('master'); diff --git a/classes/db/DBMssql.class.php b/classes/db/DBMssql.class.php index 32adb251c..10a59b985 100644 --- a/classes/db/DBMssql.class.php +++ b/classes/db/DBMssql.class.php @@ -113,7 +113,7 @@ class DBMssql extends DB * this method is private * @return boolean */ - function _begin($transactionLevel) + function _begin($transactionLevel = 0) { $connection = $this->_getConnection('master'); @@ -136,7 +136,7 @@ class DBMssql extends DB * this method is private * @return boolean */ - function _rollback($transactionLevel) + function _rollback($transactionLevel = 0) { $connection = $this->_getConnection('master'); diff --git a/classes/db/DBMysql.class.php b/classes/db/DBMysql.class.php index 2e9bf606c..545b1310a 100644 --- a/classes/db/DBMysql.class.php +++ b/classes/db/DBMysql.class.php @@ -147,7 +147,7 @@ class DBMysql extends DB * this method is private * @return boolean */ - function _begin() + function _begin($transactionLevel = 0) { return true; } @@ -157,7 +157,7 @@ class DBMysql extends DB * this method is private * @return boolean */ - function _rollback() + function _rollback($transactionLevel = 0) { return true; } diff --git a/classes/db/DBMysql_innodb.class.php b/classes/db/DBMysql_innodb.class.php index affa59aab..e19bcffe5 100644 --- a/classes/db/DBMysql_innodb.class.php +++ b/classes/db/DBMysql_innodb.class.php @@ -51,7 +51,7 @@ class DBMysql_innodb extends DBMysql * this method is private * @return boolean */ - function _begin($transactionLevel) + function _begin($transactionLevel = 0) { $connection = $this->_getConnection('master'); @@ -71,7 +71,7 @@ class DBMysql_innodb extends DBMysql * this method is private * @return boolean */ - function _rollback($transactionLevel) + function _rollback($transactionLevel = 0) { $connection = $this->_getConnection('master'); diff --git a/classes/db/DBMysqli_innodb.class.php b/classes/db/DBMysqli_innodb.class.php index 55422b61f..cfc9d23c1 100644 --- a/classes/db/DBMysqli_innodb.class.php +++ b/classes/db/DBMysqli_innodb.class.php @@ -85,7 +85,7 @@ class DBMysqli_innodb extends DBMysql * this method is private * @return boolean */ - function _begin($transactionLevel) + function _begin($transactionLevel = 0) { $connection = $this->_getConnection('master'); @@ -105,7 +105,7 @@ class DBMysqli_innodb extends DBMysql * this method is private * @return boolean */ - function _rollback($transactionLevel) + function _rollback($transactionLevel = 0) { $connection = $this->_getConnection('master'); diff --git a/classes/module/ModuleObject.class.php b/classes/module/ModuleObject.class.php index 9485a74c4..37fffc7c6 100644 --- a/classes/module/ModuleObject.class.php +++ b/classes/module/ModuleObject.class.php @@ -86,7 +86,7 @@ class ModuleObject extends Object * @param string $type type of message (error, info, update) * @return void * */ - function setMessage($message, $type = NULL) + function setMessage($message = 'success', $type = NULL) { parent::setMessage($message); $this->setMessageType($type); @@ -370,7 +370,7 @@ class ModuleObject extends Object * set the directory path of the layout directory * @return string * */ - function getLayoutPath() + function getLayoutPath($layout_name = "", $layout_type = "P") { return $this->layout_path; } diff --git a/classes/object/Object.class.php b/classes/object/Object.class.php index ed5a76bcf..9dfea8f4f 100644 --- a/classes/object/Object.class.php +++ b/classes/object/Object.class.php @@ -94,7 +94,7 @@ class Object * @param string $message Error message * @return bool Alaways returns true. */ - function setMessage($message = 'success') + function setMessage($message = 'success', $type = NULL) { if($str = Context::getLang($message)) { diff --git a/modules/layout/layout.model.php b/modules/layout/layout.model.php index 858d37400..7797edf4d 100644 --- a/modules/layout/layout.model.php +++ b/modules/layout/layout.model.php @@ -289,7 +289,7 @@ class layoutModel extends layout * @param string $layout_type (P : PC, M : Mobile) * @return string path of layout */ - function getLayoutPath($layout_name, $layout_type = "P") + function getLayoutPath($layout_name = "", $layout_type = "P") { $layout_parse = explode('|@|', $layout_name); if(count($layout_parse) > 1)