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

Registry name improvements. testGetFieldNames() improvement.

Browse Source
This commit is contained in:
Cameron
2021-01-18 19:04:55 -08:00
parent 8f27be1150
commit 75aa014de1
3 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
e107_core/shortcodes/batch/usersettings_shortcodes.php
View File

@@ -387,7 +387,7 @@ class usersettings_shortcodes extends e_shortcode
foreach($catList as $cat) foreach($catList as $cat)
{ {
e107::setRegistry("extendedcat_{$cat['user_extended_struct_id']}", $cat); e107::setRegistry("core/shortcodes/usersettings/userextended/cat_".$cat['user_extended_struct_id'], $cat);
$text = $this->sc_userextended_cat($cat['user_extended_struct_id']); $text = $this->sc_userextended_cat($cat['user_extended_struct_id']);
$ret .= $text; $ret .= $text;
$catName = vartrue($cat['user_extended_struct_text'], $cat['user_extended_struct_name']); $catName = vartrue($cat['user_extended_struct_text'], $cat['user_extended_struct_name']);
@@ -432,7 +432,7 @@ class usersettings_shortcodes extends e_shortcode
} }
$ret = ""; $ret = "";
$catInfo = e107::getRegistry("extendedcat_{$parm}"); $catInfo = e107::getRegistry("core/shortcodes/usersettings/userextended/cat_{$parm}");
if(!$catInfo) if(!$catInfo)
{ {
$qry = " $qry = "
@@ -464,7 +464,7 @@ class usersettings_shortcodes extends e_shortcode
$fieldList = $sql->db_getList(); $fieldList = $sql->db_getList();
foreach($fieldList as $field) foreach($fieldList as $field)
{ {
e107::setRegistry("extendedfield_{$field['user_extended_struct_name']}", $field); e107::setRegistry("core/shortcodes/usersettings/userextended/{$field['user_extended_struct_name']}", $field);
$ret .= $this->sc_userextended_field($field['user_extended_struct_name']); $ret .= $this->sc_userextended_field($field['user_extended_struct_name']);
} }
} }

8
e107_handlers/e107_class.php
View File

@@ -3471,7 +3471,9 @@ class e107
self::includeLan(e_LANGUAGEDIR.e_LANGUAGE.'/admin/lan_admin.php'); self::includeLan(e_LANGUAGEDIR.e_LANGUAGE.'/admin/lan_admin.php');
} }
$cstring = 'corelan/'.e_LANGUAGE.'_'.$fname.($admin ? '_admin' : '_front'); $cstring = 'core/e107/corelan/'.e_LANGUAGE.'_'.$fname.($admin ? '_admin' : '_front');
if(self::getRegistry($cstring)) if(self::getRegistry($cstring))
{ {
return null; return null;
@@ -3522,7 +3524,9 @@ class e107
*/ */
public static function plugLan($plugin, $fname = '', $flat = false) public static function plugLan($plugin, $fname = '', $flat = false)
{ {
$cstring = 'pluglan/'.e_LANGUAGE.'_'.$plugin.'_'.$fname.($flat ? '_1' : '_0'); // $cstring = 'pluglan/'.e_LANGUAGE.'_'.$plugin.'_'.$fname.($flat ? '_1' : '_0');
$cstring = 'core/e107/pluglan/'.$plugin.'/'.e_LANGUAGE.'/'.$fname.($flat ? '_1' : '_0');
if(self::getRegistry($cstring)) if(self::getRegistry($cstring))
{ {
return null; return null;

6
e107_tests/tests/unit/e107_user_extendedTest.php
View File

@@ -720,7 +720,11 @@
); );
$result = $this->ue->getFieldNames(); $result = $this->ue->getFieldNames();
$this->assertSame($expected, $result);
foreach($expected as $field)
{
$this->assertContains($field, $result);
}
} }
/* /*