diff options
author | Pierre Schmitz <pierre@archlinux.de> | 2013-01-18 16:46:04 +0100 |
---|---|---|
committer | Pierre Schmitz <pierre@archlinux.de> | 2013-01-18 16:46:04 +0100 |
commit | 63601400e476c6cf43d985f3e7b9864681695ed4 (patch) | |
tree | f7846203a952e38aaf66989d0a4702779f549962 /includes/ExternalStoreDB.php | |
parent | 8ff01378c9e0207f9169b81966a51def645b6a51 (diff) |
Update to MediaWiki 1.20.2
this update includes:
* adjusted Arch Linux skin
* updated FluxBBAuthPlugin
* patch for https://bugzilla.wikimedia.org/show_bug.cgi?id=44024
Diffstat (limited to 'includes/ExternalStoreDB.php')
-rw-r--r-- | includes/ExternalStoreDB.php | 23 |
1 files changed, 22 insertions, 1 deletions
diff --git a/includes/ExternalStoreDB.php b/includes/ExternalStoreDB.php index 4920a91c..6f2b33e1 100644 --- a/includes/ExternalStoreDB.php +++ b/includes/ExternalStoreDB.php @@ -1,4 +1,24 @@ <?php +/** + * External storage in SQL database. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * http://www.gnu.org/copyleft/gpl.html + * + * @file + */ /** * DB accessable external objects @@ -73,6 +93,7 @@ class ExternalStoreDB { /** * Fetch data from given URL * @param $url String: an url of the form DB://cluster/id or DB://cluster/id/itemid for concatened storage. + * @return mixed */ function fetchFromURL( $url ) { $path = explode( '/', $url ); @@ -157,7 +178,7 @@ class ExternalStoreDB { throw new MWException( __METHOD__.': no insert ID' ); } if ( $dbw->getFlag( DBO_TRX ) ) { - $dbw->commit(); + $dbw->commit( __METHOD__ ); } return "DB://$cluster/$id"; } |