diff options
| author | plegall <plg@piwigo.org> | 2011-03-29 10:52:44 +0000 |
|---|---|---|
| committer | plegall <plg@piwigo.org> | 2011-03-29 10:52:44 +0000 |
| commit | 805aeeb5ccc6c025dea8f16660f8ddbd78aab20a (patch) | |
| tree | 441540e1a7a391afe024b0178252cd553c03fe79 /include/ws_core.inc.php | |
| parent | 0c7171750b0cfdd09e76acdc47b901bcedaf708a (diff) | |
merge back r9743, wrong method to merge a commit from trunk to branch 2.1
git-svn-id: http://piwigo.org/svn/branches/2.1@9913 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
| -rw-r--r-- | include/ws_core.inc.php | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/include/ws_core.inc.php b/include/ws_core.inc.php index f63289611..28f834a76 100644 --- a/include/ws_core.inc.php +++ b/include/ws_core.inc.php @@ -1,8 +1,8 @@ <?php // +-----------------------------------------------------------------------+ -// | Piwigo - a PHP based photo gallery | +// | Piwigo - a PHP based picture gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2011 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2010 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -371,7 +371,6 @@ Request format: ".@$this->_requestFormat." Response format: ".@$this->_responseF @header('Content-Type: '.$contentType.'; charset='.get_pwg_charset()); print_r($encodedResponse); - trigger_action('sendResponse', $encodedResponse ); } /** @@ -577,4 +576,4 @@ Request format: ".@$this->_requestFormat." Response format: ".@$this->_responseF return $res; } } -?>
\ No newline at end of file +?> |