any 'Id' => 'id' as i'm mighty tired of the conflicts between js (lower) and php (ucFirst)

added achievemnts-page to enable display of tooltips
This commit is contained in:
Sarjuuk
2013-03-05 23:21:19 +01:00
parent edd0ff5209
commit d848faa1fa
27 changed files with 643 additions and 236 deletions

View File

@@ -140,18 +140,18 @@ abstract class BaseType
$this->curTpl = current($this->templates);
$field = $this->curTpl ? Util::getIdFieldName($this->curTpl) : null;
$this->Id = $this->curTpl ? $this->curTpl[$field] : 0;
$this->id = $this->curTpl ? $this->curTpl[$field] : 0;
while ($qty--)
next($this->templates);
return $this->Id;
return $this->id;
}
public function reset()
{
$this->curTpl = reset($this->templates);
$this->Id = $this->curTpl[Util::getIdFieldName($this->curTpl)];
$this->id = $this->curTpl[Util::getIdFieldName($this->curTpl)];
}
// read-access to templates
@@ -1192,7 +1192,7 @@ class Util
break;
case 3:
case 7:
$spl = new SpellList(array(['Id', (int)$enchant['object'.$h]]));
$spl = new SpellList(array(['id', (int)$enchant['object'.$h]]));
$gain = $spl->getStatGain();
foreach ($gain as $k => $v) // array_merge screws up somehow...
@@ -1264,6 +1264,8 @@ class Util
return 'entry';
else if (isset($tpl['Id']))
return 'Id';
else if (isset($tpl['id']))
return 'id';
else if (isset($tpl['ID']))
return 'ID';
else