Merge remote-tracking branch 'Marsup/firefox-social' into next

diff --combined index.php
index 69a8a193a35b76a71e23e379ab65024d4ae3dd9d,fad0340c21f8d04522a1ce1f242f12c0f0b0e985..80cf8beaebec6a2ca1cd771a4ea9168b376839a5
--- 1/index.php
--- 2/index.php
+++ b/index.php
@@@ -309,8 -309,8 +309,8 @@@ function autoLocale(
          if (preg_match('/([a-z]{2})-?([a-z]{2})?/i',$_SERVER['HTTP_ACCEPT_LANGUAGE'],$matches)) {
              $loc = $matches[1] . (!empty($matches[2]) ? '_' . strtoupper($matches[2]) : '');
              $attempts = array($loc.'.UTF-8', $loc, str_replace('_', '-', $loc).'.UTF-8', str_replace('_', '-', $loc),
-                 $loc . '_' . strtoupper($loc).'.UTF-8', $loc . '_' . strtoupper($loc), 
-                 $loc . '_' . $loc.'.UTF-8', $loc . '_' . $loc, $loc . '-' . strtoupper($loc).'.UTF-8', 
+                 $loc . '_' . strtoupper($loc).'.UTF-8', $loc . '_' . strtoupper($loc),
+                 $loc . '_' . $loc.'.UTF-8', $loc . '_' . $loc, $loc . '-' . strtoupper($loc).'.UTF-8',
                  $loc . '-' . strtoupper($loc), $loc . '-' . $loc.'.UTF-8', $loc . '-' . $loc);
          }
      }
@@@ -555,12 -555,9 +555,12 @@@ function endsWith($haystack,$needle,$ca
      PS: I could have used strptime(), but it does not exist on Windows. I'm too kind. */
  function linkdate2timestamp($linkdate)
  {
 -    $Y=$M=$D=$h=$m=$s=0;
 -    sscanf($linkdate,'%4d%2d%2d_%2d%2d%2d',$Y,$M,$D,$h,$m,$s);
 -    return mktime($h,$m,$s,$M,$D,$Y);
 +    if(strcmp($linkdate, '_000000') !== 0 || !$linkdate){
 +        $Y=$M=$D=$h=$m=$s=0;
 +        $r = sscanf($linkdate,'%4d%2d%2d_%2d%2d%2d',$Y,$M,$D,$h,$m,$s);
 +        return mktime($h,$m,$s,$M,$D,$Y);
 +    }
 +    return time();
  }
  
  /*  Converts a linkdate time (YYYYMMDD_HHMMSS) of an article to a RFC822 date.
@@@ -1558,7 -1555,7 +1558,7 @@@ function renderPage(
          pubsubhub();
  
          // If we are called from the bookmarklet, we must close the popup:
-         if (isset($_GET['source']) && $_GET['source']=='bookmarklet') { echo '<script>self.close();</script>'; exit; }
+         if (isset($_GET['source']) && ($_GET['source']=='bookmarklet' || $_GET['source']=='firefoxsocialapi')) { echo '<script>self.close();</script>'; exit; }
          $returnurl = ( isset($_POST['returnurl']) ? $_POST['returnurl'] : '?' );
          $returnurl .= '#'.smallHash($linkdate);  // Scroll to the link which has been edited.
          if (strstr($returnurl, "do=addlink")) { $returnurl = '?'; } //if we come from ?do=addlink, set returnurl to homepage instead
@@@ -1570,7 -1567,7 +1570,7 @@@
      if (isset($_POST['cancel_edit']))
      {
          // If we are called from the bookmarklet, we must close the popup:
-         if (isset($_GET['source']) && $_GET['source']=='bookmarklet') { echo '<script>self.close();</script>'; exit; }
+         if (isset($_GET['source']) && ($_GET['source']=='bookmarklet' || $_GET['source']=='firefoxsocialapi')) { echo '<script>self.close();</script>'; exit; }
          $returnurl = ( isset($_POST['returnurl']) ? $_POST['returnurl'] : '?' );
          $returnurl .= '#'.smallHash($_POST['lf_linkdate']);  // Scroll to the link which has been edited.
          header('Location: '.$returnurl); // After canceling, redirect to the page the user was on.
@@@ -1589,7 -1586,7 +1589,7 @@@
          $LINKSDB->savedb(); // save to disk
  
          // If we are called from the bookmarklet, we must close the popup:
-         if (isset($_GET['source']) && $_GET['source']=='bookmarklet') { echo '<script>self.close();</script>'; exit; }
+         if (isset($_GET['source']) && ($_GET['source']=='bookmarklet' || $_GET['source']=='firefoxsocialapi')) { echo '<script>self.close();</script>'; exit; }
          // Pick where we're going to redirect
          // =============================================================
          // Basically, we can't redirect to where we were previously if it was a permalink
@@@ -1597,7 -1594,7 +1597,7 @@@
          // Cases:
          //    - /             : nothing in $_GET, redirect to self
          //    - /?page        : redirect to self
-         //    - /?searchterm  : redirect to self (there might be other links) 
+         //    - /?searchterm  : redirect to self (there might be other links)
          //    - /?searchtags  : redirect to self
          //    - /permalink    : redirect to / (the link does not exist anymore)
          //    - /?edit_link   : redirect to / (the link does not exist anymore)
@@@ -1707,6 -1704,7 +1707,7 @@@
          $PAGE->assign('link_is_new',$link_is_new);
          $PAGE->assign('token',getToken()); // XSRF protection.
          $PAGE->assign('http_referer',(isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : ''));
+         $PAGE->assign('source',(isset($_GET['source']) ? $_GET['source'] : ''));
          $PAGE->assign('tags', $LINKSDB->allTags());
          $PAGE->renderPage('editlink');
          exit;
@@@ -1957,7 -1955,7 +1958,7 @@@ function buildLinkList($PAGE,$LINKSDB
              strlen($link["url"]) === 7) {
              $link["url"] = indexUrl() . $link["url"];
          }
-         
+ 
          $linkDisp[$keys[$i]] = $link;
          $i++;
      }