GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Merge branch 'master' of gitorious.org:statusnet/mainline into 1.1.x

Browse Source
This commit is contained in:
Evan Prodromou 2011-12-02 15:45:01 -05:00
commit 5365ffc7d0
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/action.php
View File

@ -302,7 +302,7 @@ class Action extends HTMLOutputter // lawsuit
$this->script('jquery.form.min.js'); $this->script('jquery.form.min.js');
$this->script('jquery-ui.min.js'); $this->script('jquery-ui.min.js');
$this->script('jquery.cookie.min.js'); $this->script('jquery.cookie.min.js');
$this->inlineScript('if (typeof window.JSON !== "object") { $.getScript("'.common_path('js/json2.min.js').'"); }'); $this->inlineScript('if (typeof window.JSON !== "object") { $.getScript("'.common_path('js/json2.min.js', StatusNet::isHTTPS()).'"); }');
$this->script('jquery.joverlay.min.js'); $this->script('jquery.joverlay.min.js');
$this->script('jquery.infieldlabel.min.js'); $this->script('jquery.infieldlabel.min.js');
} else { } else {
@ -310,7 +310,7 @@ class Action extends HTMLOutputter // lawsuit
$this->script('jquery.form.js'); $this->script('jquery.form.js');
$this->script('jquery-ui.min.js'); $this->script('jquery-ui.min.js');
$this->script('jquery.cookie.js'); $this->script('jquery.cookie.js');
$this->inlineScript('if (typeof window.JSON !== "object") { $.getScript("'.common_path('js/json2.js').'"); }'); $this->inlineScript('if (typeof window.JSON !== "object") { $.getScript("'.common_path('js/json2.js', StatusNet::isHTTPS()).'"); }');
$this->script('jquery.joverlay.js'); $this->script('jquery.joverlay.js');
$this->script('jquery.infieldlabel.js'); $this->script('jquery.infieldlabel.js');
} }

9
lib/framework.php
View File

@ -159,6 +159,15 @@ function PEAR_ErrorToPEAR_Exception($err)
common_log(LOG_ERR, "PEAR Error: $msg ($userInfo)"); common_log(LOG_ERR, "PEAR Error: $msg ($userInfo)");
// HACK: queue handlers get kicked by the long-query killer, and
// keep the same broken connection. We die here to get a new
// process started.
if (php_sapi_name() == 'cli' && preg_match('/nativecode=2006/', $userInfo)) {
common_log(LOG_ERR, "Lost DB connection; dying.");
exit(100);
}
if ($err->getCode()) { if ($err->getCode()) {
throw new PEAR_Exception($err->getMessage(), $err->getCode()); throw new PEAR_Exception($err->getMessage(), $err->getCode());
} }