Merge remote-tracking branch 'production/prod'

edit.php

@@ -60,7 +60,7 @@
 <p><a href="<?php echo $backurl; ?>">&laquo; Back to All Seeds</a></p>
 
 <div>
-<div style="float:right;"><a href="" id="editme" onload="editme()" onclick="editme(); return false;">Edit Information</a></div>
+<div style="float:right;"><a href="" id="editme" onload="editme(); return false;" onclick="editme(); return false;">Edit Information</a></div>
 <div><h2>Edit Submission</h2></div>
 </div>
 
@@ -70,6 +70,10 @@
 
 
 require(dirname(__FILE__) . '/inc/templates/form.php');
+?>
+<script type="text/javascript">
+$(document).ready(editme);
+</script>
 
-
+<?php
 stop('_edit');

inc/templates/form.php

@@ -300,7 +300,6 @@ function stopRKey(evt) {
       <input type="checkbox" name="language[]" value="japanese" /><span  data-zh="日语" data-jp="日本語" data-ko="일본어">Japanese</span>&nbsp;&nbsp;
       <input type="checkbox" name="language[]" value="chinese" /><span  data-zh="中文" data-jp="中国語" data-ko="중국어">Chinese</span>&nbsp;&nbsp;
       <input type="checkbox" name="language[]" value="korean" /><span  data-zh="韩语" data-jp="韓国語" data-ko="한국어" >Korean</span>&nbsp;&nbsp;
-      <input type="checkbox" name="language[]" value="other" /><span  data-zh="其他" data-jp="その他の言語" data-ko="다른 언어" >Other</span>&nbsp;&nbsp;
   </td>
 </tr>
 
@@ -318,4 +317,4 @@ function stopRKey(evt) {
 </tr>
 </table>
 
-</form>
+</form>

inc/templates/side1.php

@@ -1,4 +1,4 @@
-   <div id="sidebar">
+      <div id="sidebar">
         <ul>
           <li>
             <h2 data-zh="关于本项目" data-jp="この企画について" data-ko="이 프로젝트에 대하여">About this project</h2>
@@ -42,7 +42,7 @@
 
             <p>
             Drag the following
-            <a class="bookmarklet" href="javascript:q=location.href;if(document.getSelection){d=document.getSelection();}else{d='';};p=document.title;void(open('http://jdarchive.org/bookmarklet?la=en&url='+encodeURIComponent(q)+'&description='+encodeURIComponent(d)+'&title='+encodeURIComponent(p),'Bookmarklet',%20'toolbar=no,width=660,height=450'));">JDArchive link</a> to your bookmarks toolbar if you're using Firefox, Safari, Chrome or Opera.  Next time you're on a website you think is useful, just click the bookmark and we'll auto-fill some of the fields.
+            <a class="bookmarklet" href="javascript:q=location.href;if(document.getSelection){d=document.getSelection();}else{d='';};p=document.title;void(open('http://jdarchive.org/bookmarklet?url='+encodeURIComponent(q)+'&description='+encodeURIComponent(d)+'&title='+encodeURIComponent(p),'Bookmarklet',%20'toolbar=no,width=660,height=450'));">JDArchive link</a> to your bookmarks toolbar if you're using Firefox, Safari, Chrome or Opera.  Next time you're on a website you think is useful, just click the bookmark and we'll auto-fill some of the fields.
 
             </p>
 
@@ -52,4 +52,4 @@
 
         </ul>
       </div>
-      <!-- end #sidebar -->
+      <!-- end #sidebar -->

news/wp-includes/class-http.php

@@ -669,7 +669,7 @@ function request($url, $args = array()) {
 		//fsockopen has issues with 'localhost' with IPv6 with certain versions of PHP, It attempts to connect to ::1,
 		// which fails when the server is not set up for it. For compatibility, always connect to the IPv4 address.
 		if ( 'localhost' == strtolower($fsockopen_host) )
-			$fsockopen_host = 'localhost';
+			$fsockopen_host = '127.0.0.1';
 
 		// There are issues with the HTTPS and SSL protocols that cause errors that can be safely
 		// ignored and should be ignored.

seedScript.php

@@ -0,0 +1,9 @@
+<?php
+
+$arr = array();
+exec('/usr/home/jedarchi/bin/freqScript.sh 2>&1', $arr);
+
+foreach($arr as &$val) {
+    print html_entity_decode(utf8_decode($val), ENT_NOQUOTES, 'UTF-8');
+}
+?>