RanchiMall/php-mpos
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2038 from stambetto/development

Browse Source 
Minor fixes
This commit is contained in:
Sebastian Grewe 2014-03-27 20:21:44 +01:00
commit 69ea8d9702
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
public/include/classes/monitoring.class.php
View File

@ -70,9 +70,8 @@ class Monitoring extends Base {
if ($query && $query->bind_param('s', $name) && $query->execute() && $result = $query->get_result()) { if ($query && $query->bind_param('s', $name) && $query->execute() && $result = $query->get_result()) {
return $result->fetch_assoc(); return $result->fetch_assoc();
} else { } else {
$this->sqlError(); return $this->sqlError();
} }
return $value;
} }
/** /**

2
public/index.php
View File

@ -46,7 +46,7 @@ $hts = ($config['https_only'] && (!empty($_SERVER['QUERY_STRING']))) ? "https://
// Rate limiting // Rate limiting
if ($config['memcache']['enabled'] && $config['mc_antidos']['enabled']) { if ($config['memcache']['enabled'] && $config['mc_antidos']['enabled']) {
if (PHP_OS == 'WINNT') { if (PHP_OS == 'WINNT') {
require_once(CLASS_DIR . 'memcached.class.php'); require_once(CLASS_DIR . '/memcached.class.php');
} }
// memcache antidos needs a memcache handle // memcache antidos needs a memcache handle
$memcache = new Memcached(); $memcache = new Memcached();

2
public/site_assets/mpos/css/layout.css
View File

@ -11,6 +11,8 @@ padding: 0;
font-family: "Helvetica Neue", Helvetica, Arial, Verdana, sans-serif; font-family: "Helvetica Neue", Helvetica, Arial, Verdana, sans-serif;
background: #F8F8F8; background: #F8F8F8;
font-size: 12px; font-size: 12px;
min-width: 1323px;
/* Allows resizing without distortion of graphs and the like, some older browsers will ingnore this */
} }
.clear { .clear {