"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "Upload/inc/tasks/delayedmoderation.php" between
mybb_1821.zip and mybb_1822.zip

About: MyBB is a multilingual, standards-compliant and free forum (discussion board) software.

delayedmoderation.php  (mybb_1821):delayedmoderation.php  (mybb_1822)
skipping to change at line 112 skipping to change at line 112
if(!empty($unstuck_tids)) if(!empty($unstuck_tids))
{ {
$moderation->stick_threads($unstu ck_tids); $moderation->stick_threads($unstu ck_tids);
} }
break; break;
case "merge": case "merge":
// $delayedmoderation['tids'] should be a single tid // $delayedmoderation['tids'] should be a single tid
if(count($tids) != 1) if(count($tids) != 1)
{ {
continue; continue 2;
} }
// explode at # sign in a url (indicates a name reference) and reassign to the url // explode at # sign in a url (indicates a name reference) and reassign to the url
$realurl = explode("#", $input['threadurl ']); $realurl = explode("#", $input['threadurl ']);
$input['threadurl'] = $realurl[0]; $input['threadurl'] = $realurl[0];
// Are we using an SEO URL? // Are we using an SEO URL?
if(substr($input['threadurl'], -4) == "ht ml") if(substr($input['threadurl'], -4) == "ht ml")
{ {
// Get thread to merge's tid the SEO way // Get thread to merge's tid the SEO way
skipping to change at line 172 skipping to change at line 172
else if($parameters['tid']) else if($parameters['tid'])
{ {
$mergetid = $parameters['tid']; $mergetid = $parameters['tid'];
} }
$mergetid = (int)$mergetid; $mergetid = (int)$mergetid;
$mergethread = get_thread($mergetid); $mergethread = get_thread($mergetid);
if(!$mergethread['tid']) if(!$mergethread['tid'])
{ {
continue; continue 2;
} }
if($mergetid == $delayedmoderation['tids' ]) if($mergetid == $delayedmoderation['tids' ])
{ {
// sanity check // sanity check
continue; continue 2;
} }
if($input['subject']) if($input['subject'])
{ {
$subject = $input['subject']; $subject = $input['subject'];
} }
else else
{ {
$query = $db->simple_select("thre ads", "subject", "tid='{$delayedmoderation['tids']}'"); $query = $db->simple_select("thre ads", "subject", "tid='{$delayedmoderation['tids']}'");
$subject = $db->fetch_field($quer y, "subject"); $subject = $db->fetch_field($quer y, "subject");
 End of changes. 3 change blocks. 
3 lines changed or deleted 3 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)