Marriage Expansion V5.21

[Michelina]

I find this sql line from the marriage _dohook.php:

$sql = "SELECT name FROM ".db_prefix("accounts")." WHERE acctid=".$session['user']['marriedto']." AND locked=0";

..and this sql line from the marriage_func.php:

$sql = "SELECT login,sex,name,acctid FROM ".db_prefix("accounts")." WHERE acctid=$ac ORDER BY level,login";


Which one am I to change, since neither match the one shown below?

[White Knight]

You missed one in dohook. It should be under case "biostat":

[Michelina]

You missed one in dohook. It should be under case "biostat":

Thanks..but it has been changed and we still aren't seeing the spouse show up. I only have 4 married couples and have made sure all selected for it to show up in their bios...

I did find this little nugget in the bio.php inside the core:
$sql = "SELECT login, name, level, sex, title, specialty, hashorse, acctid, resurrections, bio, dragonkills, race, clanname, clanshort, clanrank, ".db_prefix("accounts").".clanid, laston, loggedin FROM " . db_prefix("accounts") . " LEFT JOIN " . db_prefix("clans") . " ON " . db_prefix("accounts") . ".clanid = " . db_prefix("clans") . ".clanid WHERE login='$char'";

Should this be changed as well?

[Boris735]

The penny belatedly drops.  When DaveS released V5.21, he said:

V5.21
Updated so the Bio works for 1.1.1.

Note: This means that the Bio won't work for 1.1.0 anymore. I'm not going to maintain both versions... If you're using 1.1.0 then stick with the old version.

So, you actually need to undo that change.  Find this query in marriage/marriage_dohook.php (under the biostat hook, thanks White Knight):

Code:

$sql = "SELECT a.acctid as userid, a.marriedto as married, b.name as partnername,a.sex as gender FROM ".db_prefix('accounts')." as a LEFT JOIN ".db_prefix('accounts')." as b ON a.marriedto=b.acctid WHERE a.acctid='$char'";

and change "a.acctid" to "a.login":

Code:

$sql = "SELECT a.acctid as userid, a.marriedto as married, b.name as partnername,a.sex as gender FROM ".db_prefix('accounts')." as a LEFT JOIN ".db_prefix('accounts')." as b ON a.marriedto=b.acctid WHERE a.login='$char'";

It's possible there are other changes that may need to be made, I'm not very familiar with 1.1.0, I'm afraid.  Better would be to find a copy of v5.20 somehow, but I don't know where you could get one.

[Michelina]

Phew! That solved that problem...but I am left with a new one that is small...

Under spouse, in the bio, it now says "secret." I found this line in the marriage_dohook.php.
 line 292-294...

if ($row['married']!=0 && $row['partnername']!="") {
         if (!get_module_pref('user_bio',"marriage",$row['userid'])) $row['partnername']="`iSecret`i";
         output("`^Spouse: `2%s`n",$row['partnername']); //do it here

and
line 300-301...

if (!get_module_pref('user_bio',"marriage",$row['userid'])) $row['partnername']="`iSecret`i";
         output("`^Spouse: `2%s`n",$partner);

It is repeated twice..Is there something that can be done?

[Boris735]

Taking the second part first... there is a bug there, that needs fixing.  Violet and Seth are never marked as secret, since that line changes $row['partnername'] instead of $partner.  This is handy, since it tells us that the problem is with the first case, but still should be fixed.  change those lines to:

Code:

  if (!get_module_pref('user_bio',"marriage",$row['userid'])) $partner="`iSecret`i";
  output("`^Spouse: `2%s`n",$partner);

Now, as for the issue you report: The spouse will be set to 'Secret' only if the preference has been set to not show up the spouse.  This is an issue with preferences, not the code.

[Michelina]

Thank you, it works great now.

I appreciate the help on this, so much!!

Miche