yolinlin/aowow
1
0
Fork 0
mirror of https://github.com/Sarjuuk/aowow.git synced 2025-11-29 15:58:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

Emotes:

Browse Source 
* display empty listview if no data
Setup
 * do not pass null instead of expected type array
 * added setup step for emotes to --firstrun *d'oh!*
 * fixed a wrong constant
This commit is contained in:
Sarjuuk
2015-08-10 00:04:33 +02:00
parent 3c69284e15
commit bd2e0ccada
6 changed files with 10 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
pages/emotes.php
View File

@@ -25,16 +25,11 @@ class EmotesPage extends GenericPage
protected function generateContent() protected function generateContent()
{ {
$emotes = new EmoteList();
if (!$emotes->error)
{
$this->lvTabs[] = array( $this->lvTabs[] = array(
'file' => 'emote', 'file' => 'emote',
'data' => $emotes->getListviewData(), 'data' => (new EmoteList())->getListviewData(),
'params' => [] 'params' => []
); );
};
} }
protected function generateTitle() protected function generateTitle()

2
setup/tools/clisetup/build.func.php
View File

@@ -15,7 +15,7 @@ function build($syncMe = null)
{ {
require_once 'setup/tools/fileGen.class.php'; require_once 'setup/tools/fileGen.class.php';
FileGen::init($syncMe !== null ? FileGen::MODE_UPDATE : FileGen::MODE_NORMAL, $syncMe); FileGen::init($syncMe !== null ? FileGen::MODE_UPDATE : FileGen::MODE_NORMAL, $syncMe ?: []);
$done = []; $done = [];
if (FileGen::$subScripts) if (FileGen::$subScripts)

1
setup/tools/clisetup/firstrun.func.php
View File

@@ -53,6 +53,7 @@ function firstrun($resume)
['SqlGen::generate', 'races', null, null, null], ['SqlGen::generate', 'races', null, null, null],
['SqlGen::generate', 'shapeshiftforms', null, null, null], ['SqlGen::generate', 'shapeshiftforms', null, null, null],
['SqlGen::generate', 'skillline', null, null, null], ['SqlGen::generate', 'skillline', null, null, null],
['SqlGen::generate', 'emotes', null, null, null],
['SqlGen::generate', 'achievement', null, null, null], ['SqlGen::generate', 'achievement', null, null, null],
['SqlGen::generate', 'creature', null, null, null], ['SqlGen::generate', 'creature', null, null, null],
['SqlGen::generate', 'currencies', null, null, null], ['SqlGen::generate', 'currencies', null, null, null],

2
setup/tools/clisetup/sql.func.php
View File

@@ -15,7 +15,7 @@ function sql($syncMe = null)
{ {
require_once 'setup/tools/sqlGen.class.php'; require_once 'setup/tools/sqlGen.class.php';
SqlGen::init($syncMe !== null ? SqlGen::MODE_UPDATE : SqlGen::MODE_NORMAL, $syncMe); SqlGen::init($syncMe !== null ? SqlGen::MODE_UPDATE : SqlGen::MODE_NORMAL, $syncMe ?: []);
$done = []; $done = [];
if (SqlGen::$subScripts) if (SqlGen::$subScripts)

2
setup/tools/filegen/realmMenu.func.php
View File

@@ -48,7 +48,7 @@ if (!CLI)
if (DB::isConnectable(DB_AUTH)) if (DB::isConnectable(DB_AUTH))
{ {
$rows = DB::Auth()->select('SELECT name, IF(timezone IN (8, 9, 10, 11, 12), "eu", "us") AS region FROM realmlist WHERE allowedSecurityLevel = 0 AND gamebuild = ?d', WOW_VERSION); $rows = DB::Auth()->select('SELECT name, IF(timezone IN (8, 9, 10, 11, 12), "eu", "us") AS region FROM realmlist WHERE allowedSecurityLevel = 0 AND gamebuild = ?d', WOW_BUILD);
foreach ($rows as $row) foreach ($rows as $row)
{ {

2
setup/tools/filegen/realms.func.php
View File

@@ -30,7 +30,7 @@ if (!CLI)
{ {
$realms = []; $realms = [];
if (DB::isConnectable(DB_AUTH)) if (DB::isConnectable(DB_AUTH))
$realms = DB::Auth()->select('SELECT id AS ARRAY_KEY, name, ? AS battlegroup, IF(timezone IN (8, 9, 10, 11, 12), "eu", "us") AS region FROM realmlist WHERE allowedSecurityLevel = 0 AND gamebuild = ?d', CFG_BATTLEGROUP, WOW_VERSION); $realms = DB::Auth()->select('SELECT id AS ARRAY_KEY, name, ? AS battlegroup, IF(timezone IN (8, 9, 10, 11, 12), "eu", "us") AS region FROM realmlist WHERE allowedSecurityLevel = 0 AND gamebuild = ?d', CFG_BATTLEGROUP, WOW_BUILD);
else else
CLISetup::log(' - realms: Auth-DB not set up .. static data g_realms will be empty', CLISetup::LOG_WARN); CLISetup::log(' - realms: Auth-DB not set up .. static data g_realms will be empty', CLISetup::LOG_WARN);