mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-19 12:51:52 +02:00
Code Issues Releases Wiki Activity

Move e107_admin/sql 'extended' classes to e107_core/sql

Browse Source
This commit is contained in:
Cameron
2013-01-23 13:38:21 -08:00
parent 972dba3037
commit 4a6ede6447
6 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
e107_admin/users_extended.php
View File

@@ -1154,13 +1154,13 @@ class users_ext
if ($tmp[$f]['type']=="db field") if ($tmp[$f]['type']=="db field")
{ {
if (is_readable(e_ADMIN.'sql/extended_'.$f.'.php')) if (is_readable(e_CORE.'sql/extended_'.$f.'.php'))
{ {
$ret .= ($this->process_sql($f)) ? LAN_CREATED." user_extended_{$f}<br />" : LAN_CREATED_FAILED." user_extended_{$f}<br />"; $ret .= ($this->process_sql($f)) ? LAN_CREATED." user_extended_{$f}<br />" : LAN_CREATED_FAILED." user_extended_{$f}<br />";
} }
else else
{ {
$ret .= str_replace('--FILE--',e_ADMIN.'sql/extended_'.$f.'.php',EXTLAN_78); $ret .= str_replace('--FILE--',e_CORE.'sql/extended_'.$f.'.php',EXTLAN_78);
} }
} }
} }

0
e107_admin/sql/db_field_defs.php → e107_core/sql/db_field_defs.php
View File

0
e107_admin/sql/extended_country.php → e107_core/sql/extended_country.php
View File

0
e107_admin/sql/extended_timezones.php → e107_core/sql/extended_timezones.php
View File

2
e107_handlers/mysql_class.php
View File

@@ -1857,7 +1857,7 @@ class e_db_mysql
} }
else else
{ // Need to try and find a table definition { // Need to try and find a table definition
$searchArray = array(e_ADMIN.'sql/db_field_defs.php'); $searchArray = array(e_CORE.'sql/db_field_defs.php');
// e107::getPref() shouldn't be used inside db handler! See db_IsLang() comments // e107::getPref() shouldn't be used inside db handler! See db_IsLang() comments
$sqlFiles = (array) $this->getConfig()->get('e_sql_list', array()); // kill any PHP notices $sqlFiles = (array) $this->getConfig()->get('e_sql_list', array()); // kill any PHP notices
foreach ($sqlFiles as $p => $f) foreach ($sqlFiles as $p => $f)

2
e107_handlers/plugin_class.php
View File

@@ -705,7 +705,7 @@ class e107plugin
function manage_extended_field_sql($action, $field_name) function manage_extended_field_sql($action, $field_name)
{ {
$f = e_ADMIN.'sql/extended_'.preg_replace('/[^\w]/', '', $field_name).'.php'; // quick security, always good idea $f = e_CORE.'sql/extended_'.preg_replace('/[^\w]/', '', $field_name).'.php'; // quick security, always good idea
if(!is_readable($f)) return false; if(!is_readable($f)) return false;