mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-03 13:17:24 +02:00
Code Issues Releases Wiki Activity

Removed obsolete ALLOW_AUTO_FIELD_DEFS constant

Browse Source
This commit is contained in:
Nick Liu
2020-01-17 15:54:56 +01:00
parent 4321c1b944
commit ef34ef7ec8
2 changed files with 4 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
e107_handlers/e_db_pdo_class.php
View File

@@ -9,13 +9,10 @@
define('MYSQL_ASSOC', 1); define('MYSQL_ASSOC', 1);
define('MYSQL_NUM', 2); define('MYSQL_NUM', 2);
define('MYSQL_BOTH', 3); define('MYSQL_BOTH', 3);
define('ALLOW_AUTO_FIELD_DEFS', true);
require_once('e_db_interface.php'); require_once('e_db_interface.php');
require_once('e_db_legacy_trait.php'); require_once('e_db_legacy_trait.php');
/** /**
* PDO MySQL class. All legacy mysql_ methods removed. * PDO MySQL class. All legacy mysql_ methods removed.
* Class e_db_pdo * Class e_db_pdo
@@ -775,7 +772,7 @@ class e_db_pdo implements e_db
// See if we need to auto-add field types array // See if we need to auto-add field types array
if(!isset($arg['_FIELD_TYPES']) && defined('ALLOW_AUTO_FIELD_DEFS') && ALLOW_AUTO_FIELD_DEFS === true) if(!isset($arg['_FIELD_TYPES']))
{ {
$arg = array_merge($arg, $this->getFieldDefs($tableName)); $arg = array_merge($arg, $this->getFieldDefs($tableName));
} }
@@ -984,7 +981,7 @@ class e_db_pdo implements e_db
if(!isset($arg['data'])) { return false; } if(!isset($arg['data'])) { return false; }
// See if we need to auto-add field types array // See if we need to auto-add field types array
if(!isset($arg['_FIELD_TYPES']) && ALLOW_AUTO_FIELD_DEFS) if(!isset($arg['_FIELD_TYPES']))
{ {
$arg = array_merge($arg, $this->getFieldDefs($tableName)); $arg = array_merge($arg, $this->getFieldDefs($tableName));
} }

12
e107_handlers/mysql_class.php
View File

@@ -25,14 +25,6 @@
* Always use $this->getConfig() method to avoid issues pointed above * Always use $this->getConfig() method to avoid issues pointed above
*/ */
/*
Parameters related to auto-generation of field definitions on db_Insert() and db_Update()
*/
define('ALLOW_AUTO_FIELD_DEFS', TRUE); // Temporary so new functionality can be disabled if it causes problems
// Uses it's own cache directory now - see e_CACHE_DB
//define('e_DB_CACHE', e_CACHE);
if(defined('MYSQL_LIGHT')) if(defined('MYSQL_LIGHT'))
{ {
define('E107_DEBUG_LEVEL', 0); define('E107_DEBUG_LEVEL', 0);
@@ -927,7 +919,7 @@ class e_db_mysql implements e_db
// See if we need to auto-add field types array // See if we need to auto-add field types array
if(!isset($arg['_FIELD_TYPES']) && ALLOW_AUTO_FIELD_DEFS) if(!isset($arg['_FIELD_TYPES']))
{ {
$arg = array_merge($arg, $this->getFieldDefs($tableName)); $arg = array_merge($arg, $this->getFieldDefs($tableName));
} }
@@ -1161,7 +1153,7 @@ class e_db_mysql implements e_db
if(!isset($arg['data'])) { return false; } if(!isset($arg['data'])) { return false; }
// See if we need to auto-add field types array // See if we need to auto-add field types array
if(!isset($arg['_FIELD_TYPES']) && ALLOW_AUTO_FIELD_DEFS) if(!isset($arg['_FIELD_TYPES']))
{ {
$arg = array_merge($arg, $this->getFieldDefs($tableName)); $arg = array_merge($arg, $this->getFieldDefs($tableName));
} }