Skip to content

Minor fixes #2038

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Mar 27, 2014
Merged

Minor fixes #2038

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
eb192c5
Merge pull request #1902 from MPOS/development
TheSerapher Mar 10, 2014
885e932
Merge pull request #1944 from MPOS/development
TheSerapher Mar 15, 2014
129f2ba
Update layout.css
Samuelnz Mar 18, 2014
2959485
Update layout.css
Samuelnz Mar 18, 2014
c562fb9
Merge pull request #1960 from SamuelNZ/patch-1
TheSerapher Mar 18, 2014
b2d8c18
Merge branch 'development'
MPOS123 Mar 19, 2014
e45a29c
Merge pull request #2019 from MPOS/development
TheSerapher Mar 26, 2014
256d438
[FIX] In case of SQL error function should return it
stambetto Mar 27, 2014
59f490d
[FIX] Wrong Memcache file path for Windows based systems
stambetto Mar 27, 2014
da40fd7
Merge branch 'development' of https://github.com/MPOS/php-mpos into d…
stambetto Mar 27, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions public/include/classes/monitoring.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,9 +70,8 @@ public function getStatus($name) {
if ($query && $query->bind_param('s', $name) && $query->execute() && $result = $query->get_result()) {
return $result->fetch_assoc();
} else {
$this->sqlError();
return $this->sqlError();
}
return $value;
}

/**
Expand Down
2 changes: 1 addition & 1 deletion public/index.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ function cfip() { return (@defined('SECURITY')) ? 1 : 0; }
// Rate limiting
if ($config['memcache']['enabled'] && $config['mc_antidos']['enabled']) {
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 = new Memcached();
Expand Down
2 changes: 2 additions & 0 deletions public/site_assets/mpos/css/layout.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ padding: 0;
font-family: "Helvetica Neue", Helvetica, Arial, Verdana, sans-serif;
background: #F8F8F8;
font-size: 12px;
min-width: 1323px;
/* Allows resizing without distortion of graphs and the like, some older browsers will ingnore this */
}

.clear {
Expand Down