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

Update share.class.php

Browse Source
This commit is contained in:
obigal 2013-07-05 14:00:36 -04:00 committed by Sebastian Grewe
parent f7a95d9f26
commit 5607103d81
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
public/include/classes/share.class.php
View File

@ -13,12 +13,19 @@ class Share {
// This defines each share // This defines each share
public $rem_host, $username, $our_result, $upstream_result, $reason, $solution, $time, $difficulty; public $rem_host, $username, $our_result, $upstream_result, $reason, $solution, $time, $difficulty;
<<<<<<< HEAD
public function __construct($debug, $mysqli, $user, $block, $config) { public function __construct($debug, $mysqli, $user, $block, $config) {
$this->debug = $debug; $this->debug = $debug;
$this->mysqli = $mysqli; $this->mysqli = $mysqli;
$this->user = $user; $this->user = $user;
$this->config = $config; $this->config = $config;
$this->block = $block; $this->block = $block;
=======
public function __construct($debug, $mysqli, $config, $salt) {
$this->debug = $debug;
$this->mysqli = $mysqli;
$this->config = $config;
>>>>>>> Update share.class.php
$this->debug->append("Instantiated Share class", 2); $this->debug->append("Instantiated Share class", 2);
} }