[MediaWiki-CVS] SVN: [63109] trunk/extensions/RecordAdmin
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/63109
Revision: 63109
Author: nad
Date: 2010-03-01 05:23:27 + (Mon, 01 Mar 2010)
Log Message:
---
create static method getRecordsByType and reduce getRecords slightly by using it
Modified Paths:
--
trunk/extensions/RecordAdmin/RecordAdmin.php
trunk/extensions/RecordAdmin/RecordAdmin_body.php
Modified: trunk/extensions/RecordAdmin/RecordAdmin.php
===
--- trunk/extensions/RecordAdmin/RecordAdmin.php2010-03-01 04:39:56 UTC
(rev 63108)
+++ trunk/extensions/RecordAdmin/RecordAdmin.php2010-03-01 05:23:27 UTC
(rev 63109)
@@ -11,7 +11,7 @@
* @licence GNU General Public Licence 2.0 or later
*/
-define( 'RECORDADMIN_VERSION', '0.11.1, 2010-02-26' );
+define( 'RECORDADMIN_VERSION', '0.11.2, 2010-03-01' );
$wgRecordAdminUseNamespaces = false; # Whether record articles should be
in a namespace of the same name as their type
$wgRecordAdminCategory = 'Records'; # Category containing record types
Modified: trunk/extensions/RecordAdmin/RecordAdmin_body.php
===
--- trunk/extensions/RecordAdmin/RecordAdmin_body.php 2010-03-01 04:39:56 UTC
(rev 63108)
+++ trunk/extensions/RecordAdmin/RecordAdmin_body.php 2010-03-01 05:23:27 UTC
(rev 63109)
@@ -343,16 +343,9 @@
# If an export has been requested but not for this query-id,
then bail with empty set
if ( ( $export = $wgRequest->getText( 'quid' ) ) && $export !=
$this->quid ) return array();
- # First get all the articles using the type's template
+ # Loop through all records of this type adding only those that
match the regex fields
$records = array();
- $dbr = wfGetDB( DB_SLAVE );
- $tbl = $dbr->tableName( 'templatelinks' );
- $ty = $dbr->addQuotes( $type );
- $res = $dbr->select( $tbl, 'tl_from', "tl_namespace = 10 AND
tl_title = $ty", __METHOD__ );
-
- # Loop through them adding only those that match the regex
fields
- while ( $row = $dbr->fetchRow( $res ) ) {
- $t = Title::newFromID( $row[0] );
+ foreach ( self::getRecordsByType( $type ) as $t ) {
if ( empty( $wpTitle ) || eregi( $wpTitle,
$t->getPrefixedText() ) ) {
$a = new Article( $t );
$text = $a->getContent();
@@ -370,9 +363,9 @@
if ( $match ) $records[] = $r;
}
}
- $dbr->freeResult( $res );
# Add the creation and modified date columns to the records
+ $dbr = wfGetDB( DB_SLAVE );
foreach ( $records as $i => $r ) {
$t = $r[0];
$id = $t->getArticleID();
@@ -422,6 +415,18 @@
return $records;
}
+ static function getRecordsByType( $type ) {
+ $records = array();
+ $dbr = wfGetDB( DB_SLAVE );
+ $tbl = $dbr->tableName( 'templatelinks' );
+ $ty = $dbr->addQuotes( $type );
+ $res = $dbr->select( $tbl, 'tl_from', "tl_namespace = 10 AND
tl_title = $ty", __METHOD__ );
+ while ( $row = $dbr->fetchRow( $res ) ) $records[] =
Title::newFromID( $row[0] );
+ $dbr->freeResult( $res );
+ return $records;
+ }
+
+
/**
* Compares a field value according to its operator
* - $a is the field value for the current row
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [63108] trunk/extensions/SemanticForms/includes/SF_FormPrinter.inc
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/63108
Revision: 63108
Author: yaron
Date: 2010-03-01 04:39:56 + (Mon, 01 Mar 2010)
Log Message:
---
Removed Sanitizer::safeEncodeAttribute() call - was messing up partial forms
Modified Paths:
--
trunk/extensions/SemanticForms/includes/SF_FormPrinter.inc
Modified: trunk/extensions/SemanticForms/includes/SF_FormPrinter.inc
===
--- trunk/extensions/SemanticForms/includes/SF_FormPrinter.inc 2010-03-01
02:17:30 UTC (rev 63107)
+++ trunk/extensions/SemanticForms/includes/SF_FormPrinter.inc 2010-03-01
04:39:56 UTC (rev 63108)
@@ -1154,7 +1154,6 @@
$free_text = null;
$existing_page_content = preg_replace('/�\{(.*?)\}�/s', '{{\1}}',
$existing_page_content);
$existing_page_content = preg_replace('/\{\{\{insertionpoint\}\}\}/',
'', $existing_page_content);
- $existing_page_content =
Sanitizer::safeEncodeAttribute($existing_page_content);
}
} elseif ($source_is_page) {
// if the page is the source, free_text will just be whatever in the
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [63107] trunk/phase3/languages/messages
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/63107
Revision: 63107
Author: shinjiman
Date: 2010-03-01 02:17:30 + (Mon, 01 Mar 2010)
Log Message:
---
Localisation updates Cantonese, Chinese and Literary Chinese
Modified Paths:
--
trunk/phase3/languages/messages/MessagesLzh.php
trunk/phase3/languages/messages/MessagesYue.php
trunk/phase3/languages/messages/MessagesZh_hans.php
trunk/phase3/languages/messages/MessagesZh_hant.php
Modified: trunk/phase3/languages/messages/MessagesLzh.php
===
--- trunk/phase3/languages/messages/MessagesLzh.php 2010-02-28 23:39:44 UTC
(rev 63106)
+++ trunk/phase3/languages/messages/MessagesLzh.php 2010-03-01 02:17:30 UTC
(rev 63107)
@@ -410,6 +410,8 @@
'missingarticle-diff' => '（異：$1，$2）',
'internalerror'=> '家誤',
'internalerror_info' => '家誤：$1',
+'fileappenderrorread' => '當附時無讀 "$1"，未可為也。',
+'fileappenderror' => '"$2"附"$1"，未可為也。',
'filecopyerror'=> '"$1"謄"$2"，未可為也。',
'filerenameerror' => '"$2"替"$1"名，未可為也。',
'filedeleteerror' => '"$1"未可刪也。',
@@ -517,6 +519,7 @@
'login-throttled'=> '爾多試於此簿登中。
請候再試之。',
'loginlanguagelabel' => '語：$1',
+'suspicious-userlogout' => '爾欲無離也，可由壞瀏覽器或快枝代理呈送之。',
# Password reset dialog
'resetpass' => '變符',
@@ -532,6 +535,7 @@
'resetpass_forbidden' => '無改符節',
'resetpass-no-info' => '爾須登簿後方進此頁。',
'resetpass-submit-loggedin' => '改符節',
+'resetpass-submit-cancel' => '消',
'resetpass-wrong-oldpass' => '無效之臨符或現符。
爾或改符，或求新臨符。',
'resetpass-temp-password' => '臨符節:',
@@ -609,6 +613,8 @@
'noarticletext-nopermission' =>
'查無此文。[[Special:Search/{{PAGENAME}}|尋題]]，或[{{fullurl:{{#Special:Log}}|page={{FULLPAGENAMEE
尋誌]。',
'userpage-userdoesnotexist'=> '「$1」之簿未增也。請建纂本頁前查之。',
'userpage-userdoesnotexist-view' => '「$1」之簿未增也。',
+'blocked-notice-logextract'=> '該簿現鎖也。
+下列之記鎖，以察之：',
'clearyourcache' => "'''註：'''重取頁面，文方新焉。
'''Mozilla / Firefox /
Safari:'''押''Shift''並點''重新載入''，或合鍵''Ctrl-F5''或''Ctrl-R''（Macintosh為''Command-R''）。
'''Konqueror:'''點''Reload''，或押''F5''。
@@ -1275,6 +1281,7 @@
'minlength1' => '名務逾一字元。',
'illegalfilename'=> '名"$1"不格，更之再焉。',
'badfilename'=> '更名"$1。"。',
+'filetype-mime-mismatch' => '檔展名無配MIME類。',
'filetype-badmime' => '「$1」之MIME類物檔案不能獻之。',
'filetype-bad-ie-mime' => '因 Internet Explorer 偵作「$1」不貢也。它乃有危險之類也。',
'filetype-unwanted-type' => "'''「.$1」'''乃無需之物類也。
@@ -2488,16 +2495,42 @@
'limitall' => '全',
# E-mail address confirmation
-'confirmemail' => '核郵驛',
-'confirmemail_noemail' => '[[Special:Preferences|簿註]]有驛。',
-'confirmemail_send'=> '遣核符',
-'confirmemail_sent'=> '核符遣矣',
-'confirmemail_sendfailed' => '{{SITENAME}}信未遣焉，請核郵驛。
+'confirmemail' => '核郵驛',
+'confirmemail_noemail' => '[[Special:Preferences|簿註]]有驛。',
+'confirmemail_send' => '遣核符',
+'confirmemail_sent' => '核符遣矣',
+'confirmemail_sendfailed' => '{{SITENAME}}信未遣焉，請核郵驛。
郵者覆之：$1',
-'confirmemail_invalidated' => '核郵驛消也',
-'invalidateemail' => '消核郵驛',
+'confirmemail_body' => '持IP $1之人（亦為汝）於{{SITENAME}}建簿"$2"，並呈電郵位址。
+確此簿屬爾，並用{{SITENAME}}之電郵。
+於瀏覽器上開此連：
+
+$3
+
+如汝之簿*未*增，
+於瀏覽器上開此連消確：
+
+$5
+
+確碼於$4過之。',
+'confirmemail_body_changed' => '持IP $1之人（亦為汝）於{{SITENAME}}改簿"$2"之電郵。
+
+確此簿屬爾，並用{{SITENAME}}之電郵。
+於瀏覽器上開此連：
+
+$3
+
+如此簿*非*爾之，
+於瀏覽器上開此連消確：
+
+$5
+
+確碼於$4過之。',
+'confirmemail_invalidated' => '核郵驛消也',
+'invalidateemail' => '消核郵驛',
+
# Scary transclusion
'scarytranscludedisabled' => '[蓋跨共筆之轉碼者，莫之能用也]',
'scarytranscludefailed' => '[$1模不得]',
Modified: trunk/phase3/languages/messages/MessagesYue.php
===
--- trunk/phase3/languages/messages/MessagesYue.php 2010-02-28 23:39:44 UTC
(rev 63106)
+++ trunk/phase3/languages/messages/MessagesYue.php 2010-03-01 02:17:30 UTC
(rev 63107)
@@ -496,6 +496,8 @@
'readonly_lag' => '當從伺服器追緊主伺服器時，資料庫會自動被鎖',
'internalerror'=> '內部錯誤',
'internalerror_info' => '內部錯誤: $1',
+'fileappenderrorread' => '當附加嗰陣讀唔到 "$1"。',
+'fileappenderror' => '附加唔到 "$1" 去 "$2"。',
'filecopyerror'=> '檔案 "$1" 抄唔到去 "$2"。',
'filerenameerror' => '檔案 "$1" 唔改得做 "$2"。',
'filedeleteerror' => '檔案 "$1" 唔刪得。',
@@ -616,6 +618,7 @@
'usernamehasherror' => '用戶名唔可以包含切細字元',
'login-throttled'=> '你已經試咗太多次登入動作。請等多一陣再試過。',
'loginlanguagelabel' => '語言：$1',
+'suspicious-userlogout' => '你去登出嘅要求已經拒絕咗，因為佢可能由壞咗嘅瀏覽器或者快取代理傳送。',
# Password reset dialog
'resetpass' => '改密碼',
@@ -631,6 +634,7 @@
'resetpass_forbidden' => '唔可以更改密碼',
'resetpass-no-info' => '你一定要登入咗去直接入來呢一版。',
'resetpass-submit-loggedin' => '改密碼',
+'resetpass-submit-cancel' => '取消',
'resetpass-wrong-oldpas
[MediaWiki-CVS] SVN: [63106] trunk/extensions/Storyboard
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/63106
Revision: 63106
Author: jeroendedauw
Date: 2010-02-28 23:39:44 + (Sun, 28 Feb 2010)
Log Message:
---
Added API class for actions on the story review special page
Modified Paths:
--
trunk/extensions/Storyboard/Storyboard.php
trunk/extensions/Storyboard/api/ApiStoryboardStoriesFeed.php
Added Paths:
---
trunk/extensions/Storyboard/api/ApiStoryReview.php
Modified: trunk/extensions/Storyboard/Storyboard.php
===
--- trunk/extensions/Storyboard/Storyboard.php 2010-02-28 23:27:31 UTC (rev
63105)
+++ trunk/extensions/Storyboard/Storyboard.php 2010-02-28 23:39:44 UTC (rev
63106)
@@ -49,6 +49,8 @@
// API
$wgAutoloadClasses['ApiStoryboardStoriesFeed'] =
"{$egStoryboardDir}api/ApiStoryboardStoriesFeed.php";
$wgAPIListModules['stories'] = 'ApiStoryboardStoriesFeed';
+$wgAutoloadClasses['ApiStoryReview'] =
"{$egStoryboardDir}api/ApiStoryReview.php";
+$wgAPIModules['storyreview'] = 'ApiStoryReview';
// Hooks
$wgHooks['ParserFirstCallInit'][] = 'efStoryboardParserFirstCallInit';
Added: trunk/extensions/Storyboard/api/ApiStoryReview.php
===
--- trunk/extensions/Storyboard/api/ApiStoryReview.php
(rev 0)
+++ trunk/extensions/Storyboard/api/ApiStoryReview.php 2010-02-28 23:39:44 UTC
(rev 63106)
@@ -0,0 +1,77 @@
+http://www.gnu.org/copyleft/gpl.html
+ */
+
+if ( !defined( 'MEDIAWIKI' ) ) {
+ // Eclipse helper - will be ignored in production
+ require_once ( "ApiBase.php" );
+}
+
+/**
+ * This action returns the html for Stories to be displayed in a storyboard.
+ *
+ * @ingroup Storyboard
+ */
+class ApiStoryReview extends ApiBase {
+
+ public function __construct( $main, $action ) {
+ parent::__construct( $main, $action );
+ }
+
+ public function execute() {
+ global $wgUser;
+
+ }
+
+ public function getAllowedParams() {
+ return array(
+ );
+ }
+
+ public function getParamDescription() {
+ return array(
+ );
+ }
+
+ public function getDescription() {
+ return array(
+ 'Story review actions'
+ );
+ }
+
+ public function getPossibleErrors() {
+ return array_merge( parent::getPossibleErrors(), array(
+ ) );
+ }
+
+ protected function getExamples() {
+ return array(
+ 'api.php?action=storyreview&...' // TODO
+ );
+ }
+
+ public function getVersion() {
+ return __CLASS__ . ': $Id: $';
+ }
+}
\ No newline at end of file
Property changes on: trunk/extensions/Storyboard/api/ApiStoryReview.php
___
Added: svn:eol-style
+ native
Modified: trunk/extensions/Storyboard/api/ApiStoryboardStoriesFeed.php
===
--- trunk/extensions/Storyboard/api/ApiStoryboardStoriesFeed.php
2010-02-28 23:27:31 UTC (rev 63105)
+++ trunk/extensions/Storyboard/api/ApiStoryboardStoriesFeed.php
2010-02-28 23:39:44 UTC (rev 63106)
@@ -2,7 +2,7 @@
/**
* API extension for Storyboard.
*
- * @file ApiStories.php
+ * @file ApiStoryboardStoriesFeed.php
* @ingroup Storyboard
*
* @author Jeroen De Dauw
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [63105] trunk/extensions/Storyboard
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/63105
Revision: 63105
Author: jeroendedauw
Date: 2010-02-28 23:27:31 + (Sun, 28 Feb 2010)
Log Message:
---
Modifications for getting storyboard content + support for width and height
parameters
Modified Paths:
--
trunk/extensions/Storyboard/api/ApiStoryboardStoriesFeed.php
trunk/extensions/Storyboard/tags/Storyboard/Storyboard_body.php
trunk/extensions/Storyboard/tags/Storyboard/jquery.ajaxscroll.js
Modified: trunk/extensions/Storyboard/api/ApiStoryboardStoriesFeed.php
===
--- trunk/extensions/Storyboard/api/ApiStoryboardStoriesFeed.php
2010-02-28 23:09:10 UTC (rev 63104)
+++ trunk/extensions/Storyboard/api/ApiStoryboardStoriesFeed.php
2010-02-28 23:27:31 UTC (rev 63105)
@@ -66,9 +66,9 @@
'id' => $story->story_id,
'author' => $story->story_author_name,
'title' => $story->story_title,
- 'text' => $story->story_text,
'created' => wfTimestamp( TS_ISO_8601,
$story->story_created ),
);
+ ApiResult::setContent( $res, ( is_null(
$story->story_text ) ? '' : $story->story_text ) );
$this->getResult()->addValue( array( 'query',
$this->getModuleName() ), null, $res );
}
Modified: trunk/extensions/Storyboard/tags/Storyboard/Storyboard_body.php
===
--- trunk/extensions/Storyboard/tags/Storyboard/Storyboard_body.php
2010-02-28 23:09:10 UTC (rev 63104)
+++ trunk/extensions/Storyboard/tags/Storyboard/Storyboard_body.php
2010-02-28 23:27:31 UTC (rev 63105)
@@ -16,23 +16,75 @@
class TagStoryboard {
public static function render( $input, $args, $parser, $frame ) {
- global $wgOut, $wgJsMimeType, $egStoryboardScriptPath,
$wgScriptPath;
+ global $wgOut, $wgJsMimeType, $wgScriptPath,
$egStoryboardScriptPath, $egStoryboardWidth, $egStoryboardHeight;
$wgOut->addStyle($egStoryboardScriptPath .
'/tags/Storyboard/storyboard.css');
$wgOut->includeJQuery();
$wgOut->addScriptFile($egStoryboardScriptPath .
'/tags/Storyboard/jquery.ajaxscroll.js');
-
+
+ $widthGiven = array_key_exists('width', $args)
+ && (is_numeric($args['width'])
+ || (strlen($args['width']) > 1
+ && is_numeric(substr($args['width'], 0,
strlen($args['width']) - 1))
+ && substr($args['width'],
strlen($args['width']) == '%'
+ )
+ )
+ );
+ $width = $widthGiven ? $args['width'] : $egStoryboardWidth;
+
+ $heightGiven = array_key_exists('height', $args)
+ && (is_numeric($args['height'])
+ || (strlen($args['height']) > 1
+ && is_numeric(substr($args['height'],
0, strlen($args['height']) - 1))
+ && substr($args['height'],
strlen($args['height']) == '%'
+ )
+ )
+ );
+ $height = $heightGiven ? $args['height'] : $egStoryboardHeight;
+
+ TagStoryboard::addPxWhenNeeded($width);
+ TagStoryboard::addPxWhenNeeded($height);
+
$output = <<
+
/**/
EOT;
return array($output, 'noparse' => 'true', 'isHTML' => 'true');
}
+ /**
+* Adds 'px' to a width or height value when it's not there
[MediaWiki-CVS] SVN: [63104] trunk/extensions/Translate/groups/Wikiblame.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/63104 Revision: 63104 Author: siebrand Date: 2010-02-28 23:09:10 + (Sun, 28 Feb 2010) Log Message: --- Fix optional Modified Paths: -- trunk/extensions/Translate/groups/Wikiblame.php Modified: trunk/extensions/Translate/groups/Wikiblame.php === --- trunk/extensions/Translate/groups/Wikiblame.php 2010-02-28 22:38:08 UTC (rev 63103) +++ trunk/extensions/Translate/groups/Wikiblame.php 2010-02-28 23:09:10 UTC (rev 63104) @@ -25,7 +25,7 @@ 'messages\\x5b\'contact_link\'\\x5d', 'messages\\x5b\'lang_example\'\\x5d', 'messages\\x5b\'project_example\'\\x5d', - 'messages\\x5b\'binary in wp\'\\x5d', + 'messages\\x5b\'binary_in_wp\'\\x5d', ); public $header = 'https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [63103] trunk/extensions/Transliterator/transliteratorParserTests.txt
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/63103
Revision: 63103
Author: conrad
Date: 2010-02-28 22:38:08 + (Sun, 28 Feb 2010)
Log Message:
---
Add some parser tests for transliterator
Added Paths:
---
trunk/extensions/Transliterator/transliteratorParserTests.txt
Added: trunk/extensions/Transliterator/transliteratorParserTests.txt
===
--- trunk/extensions/Transliterator/transliteratorParserTests.txt
(rev 0)
+++ trunk/extensions/Transliterator/transliteratorParserTests.txt
2010-02-28 22:38:08 UTC (rev 63103)
@@ -0,0 +1,371 @@
+!! article
+Mediawiki:Transliterator:el
+!! text
+α => a
+ά => á
+αι => ai
+άι => ai
+αϊ => ai
+αυ => av
+αυθ => afth
+αυκ => afk
+αυξ => afx
+αυπ => afp
+αυσ => afs
+αυς => afs
+αυτ => aft
+αυφ => aff
+αυχ => afch
+αυψ => afps
+αυ$ => af
+αύ => áv
+αύθ => áfth
+αύκ => áfk
+αύξ => áfx
+αύπ => áfp
+αύσ => áfs
+αύς => áfs
+αύτ => áft
+αύφ => áff
+αύχ => áfch
+αύψ => áfps
+αύ$ => áf
+άυ => áy
+αϋ => aÿ
+β => v
+γ => g
+γγ => ng
+γξ => nx
+γκ => gk
+γχ => nch
+δ => d
+ε => e
+έ => é
+ει => ei
+έι => ei
+εϊ => ei
+ευ => ev
+ευθ => efth
+ευκ => efk
+ευξ => efx
+ευπ => efp
+ευσ => efs
+ευς => efs
+ευτ => eft
+ευφ => eff
+ευχ => efch
+ευψ => efps
+ευ$ => ef
+εύ => év
+εύθ => éfth
+εύκ => éfk
+εύξ => éfx
+εύπ => éfp
+εύσ => éfs
+εύς => éfs
+εύτ => éft
+εύφ => éff
+εύχ => éfch
+εύψ => éfps
+εύ$ => éf
+έυ => éy
+εϋ => eÿ
+ζ => z
+η => i
+ή => í
+ηυ => iv
+ηυθ => ifth
+ηυκ => ifk
+ηυξ => ifx
+ηυπ => ifp
+ηυσ => ifs
+ηυς => ifs
+ηυτ => ift
+ηυφ => iff
+ηυχ => ifch
+ηυψ => ifps
+ηυ$ => if
+ηύ => ív
+ηύθ => ífth
+ηύκ => ífk
+ηύξ => ífx
+ηύπ => ífp
+ηύσ => ífs
+ηύς => ífs
+ηύτ => íft
+ηύφ => íff
+ηύχ => ífch
+ηύ$ => íf
+ήυ => íy
+ηϋ => iÿ
+θ => th
+ι => i
+ί => í
+ϊ => ï
+ΐ => í
+κ => k
+λ => l
+μ => m
+^μπ => b
+μπ => mp
+ν => n
+ντ => nt
+ξ => x
+ο => o
+ό => ó
+οι => oi
+όι => oi
+οϊ => oi
+ου => ou
+όυ => óy
+οϋ => oÿ
+π => p
+ρ => r
+σ => s
+ς => s
+τ => t
+υ => y
+ύ => ý
+ϋ => ÿ
+ΰ => ý
+υι => yi
+φ => f
+χ => ch
+ψ => ps
+ω => o
+ώ => ó
+!! endarticle
+
+!! article
+MediaWiki:Transliterator:ko
+!! text
+
+ # Single letters take from
http://cpansearch.perl.org/src/KAWASAKI/Lingua-KO-Romanize-Hangul-0.20/lib/Lingua/KO/Romanize/Hangul.pm
+ # It needs some special cases for certain adjacent characters but I cannot
decipher the documentation, and the perl code above
+ # seems to replace characters only in circumstances that they can't appear.
+
+ # initial
+ ᄀ => g
+ ᄁ => kk
+ ᄂ => n
+ ᄃ => d
+ ᄄ => tt
+ ᄅ => r
+ ᄆ => m
+ ᄇ => b
+ ᄈ => pp
+ ᄉ => s
+ ᄊ => ss
+ ᄋ =>
+ ᄌ => j
+ ᄍ => jj
+ ᄎ => ch
+ ᄏ => k
+ ᄐ => t
+ ᄑ => p
+ ᄒ => h
+ # Vowel
+ ᅡ => a
+ ᅢ => ae
+ ᅣ => ya
+ ᅤ => yae
+ ᅥ => eo
+ ᅦ => e
+ ᅧ => yeo
+ ᅨ => ye
+ ᅩ => o
+ ᅪ => wa
+ ᅫ => wae
+ ᅬ => oe
+ ᅭ => yo
+ ᅮ => u
+ ᅯ => wo
+ ᅰ => we
+ ᅱ => wi
+ ᅲ => yu
+ ᅳ => eu
+ ᅴ => ui
+ ᅵ => i
+ # Final
+ # This first character seems to indicate "no tail" rather than exist as a
character.
+ ᆧ =>
+ ᆨ => g
+ ᆩ => kk
+ ᆪ => ks
+ ᆫ => n
+ ᆬ => nj
+ ᆭ => nh
+ ᆮ => d
+ ᆯ => r
+ ᆰ => rg
+ ᆱ => rm
+ ᆲ => rb
+ ᆳ => rs
+ ᆴ => rt
+ ᆵ => rp
+ ᆶ => rh
+ ᆷ => m
+ ᆸ => b
+ ᆹ => bs
+ ᆺ => s
+ ᆻ => ss
+ ᆼ => ng
+ ᆽ => j
+ ᆾ => c
+ ᆿ => k
+ ᇀ => t
+ ᇁ => p
+ ᇂ => h
+!! endarticle
+
+!! test
+transliterator: basic
+!! input
+{{#transliterate:el|μονάδα}}
+{{#transliterate:el|Λίνουξ}}
+{{#transliterate:el|μπανάνα}}
+!! result
+monáda
+Línoux
+banána
+
+!! end
+
+!! test
+transliterator: decomposed
+!! input
+{{#transliterate:ko|명사}}
+!! result
+myeongsa
+
+!! end
+
+!! article
+MediaWiki:Transliterator:syntax
+!! text
+invalid rule
+!! endarticle
+
+!! article
+MediaWiki:Transliterator:ambiguous
+!! text
+ A => b
+A=>c
+!! endarticle
+
+!! article
+MediaWiki:Transliterator:overlong
+!! text
+{{subst:MediaWiki:Transliterator:el}}
+{{subst:MediaWiki:Transliterator:el}}
+{{subst:MediaWiki:Transliterator:el}}
+{{subst:MediaWiki:Transliterator:el}}
+!! endarticle
+
+!! article
+MediaWiki:Transliterator:rulelength
+!! text
+maybe a huge rule will work => no it won't
+!! endarticle
+
+!! test
+transliterator: error messages
+!! input
+{{#transliterate:syntax|what}}
+{{#transliterate:ambiguous|what}}
+{{#transliterate:overlong|what}}
+{{#transliterate:rulelength|what}}
+!! result
+ Invalid syntax invalid
rule in MediaWiki:Transliterator:syntax
+ Ambiguous rule A=>c in
MediaWiki:Transliterator:ambiguous
+ More than 255 rules in MediaWiki:Transliterator:overlong
+ Rule maybe a huge rule will work
=> no it won't has more than 10 characters on the left in MediaWiki:Transliterator:rulelength
+
+!! end
+
+!! article
+MediaWiki:Transliterator:bookends
+!! text
+
+n => N
+^n$ => M
+s => s
+^s => S
+^ss => ß
+e$ => g
+!! endarticle
+
+!! test
+transliterator: bookends
+!! input
+{{#transliterate:bookends|nn}}
+{{#transliterate:bookends|n, n!}}
+
[MediaWiki-CVS] SVN: [63102] trunk/extensions/SocialProfile/UserSystemMessages/ UserSystemMessagesClass.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/63102
Revision: 63102
Author: ashley
Date: 2010-02-28 21:44:54 + (Sun, 28 Feb 2010)
Log Message:
---
SocialProfile: rewrote UserSystemMessage's DB query
Modified Paths:
--
trunk/extensions/SocialProfile/UserSystemMessages/UserSystemMessagesClass.php
Modified:
trunk/extensions/SocialProfile/UserSystemMessages/UserSystemMessagesClass.php
===
---
trunk/extensions/SocialProfile/UserSystemMessages/UserSystemMessagesClass.php
2010-02-28 21:40:31 UTC (rev 63101)
+++
trunk/extensions/SocialProfile/UserSystemMessages/UserSystemMessagesClass.php
2010-02-28 21:44:54 UTC (rev 63102)
@@ -17,13 +17,14 @@
$user_id = User::idFromName( $user_name );
$dbw = wfGetDB( DB_MASTER );
- $dbw->insert( 'user_system_messages',
+ $dbw->insert(
+ 'user_system_messages',
array(
'um_user_id' => $user_id,
'um_user_name' => $user_name,
'um_type' => $type,
'um_message' => $message,
- 'um_date' => date( "Y-m-d H:i:s" ),
+ 'um_date' => date( 'Y-m-d H:i:s' ),
), __METHOD__
);
$dbw->commit();
@@ -50,36 +51,31 @@
public function getMessageList( $type, $limit = 0, $page = 0 ) {
$dbw = wfGetDB( DB_MASTER );
- $limit_sql = '';
if ( $limit > 0 ) {
$limitvalue = 0;
- if ( $page )
+ if ( $page ) {
$limitvalue = $page * $limit - ( $limit );
- $limit_sql = " LIMIT {$limitvalue},{$limit} ";
- # $params['LIMIT'] = $limitvalue;
+ }
+ $params['LIMIT'] = $limit;
+ $params['OFFSET'] = $limitvalue;
}
-/* $params['ORDER BY'] = 'ug_id DESC';
- $res = $dbw->select( array( 'user_gift', 'gift' ),
+ $params['ORDER BY'] = 'ug_id DESC';
+ $res = $dbw->select(
+ array( 'user_gift', 'gift' ),
array(
- 'ug_id', 'ug_user_id_from',
'ug_user_name_from', 'ug_gift_id', 'ug_date', 'ug_status',
- 'gift_name', 'gift_description',
'gift_given_count'
+ 'ug_id', 'ug_user_id_from',
'ug_user_name_from', 'ug_gift_id',
+ 'ug_date', 'ug_status', 'gift_name',
'gift_description',
+ 'gift_given_count'
),
- array( 'ug_user_id_to' => $this->user_id ),
+ array( "ug_user_id_to = {$this->user_id}" ),
__METHOD__,
$params,
array( 'gift' => array( 'INNER JOIN', 'ug_gift_id =
gift_id' ) )
- );*/
- $sql = "SELECT ug_id, ug_user_id_from, ug_user_name_from,
ug_gift_id, ug_date, ug_status,
- gift_name, gift_description, gift_given_count
- FROM {$dbw->tableName( 'user_gift' )} INNER JOIN
{$dbw->tableName( 'gift' )} ON ug_gift_id=gift_id
- WHERE ug_user_id_to = {$this->user_id}
- ORDER BY ug_id DESC
- {$limit_sql}";
+ );
- $res = $dbw->query( $sql );
$requests = array();
- while ( $row = $dbw->fetchObject( $res ) ) {
+ foreach ( $res as $row ) {
$requests[] = array(
'id' => $row->ug_id,
'gift_id' => $row->ug_gift_id,
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [63101] trunk/extensions/SocialProfile/UserGifts
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/63101
Revision: 63101
Author: ashley
Date: 2010-02-28 21:40:31 + (Sun, 28 Feb 2010)
Log Message:
---
SocialProfile: rewrote UserGifts' DB queries
Modified Paths:
--
trunk/extensions/SocialProfile/UserGifts/GiftsClass.php
trunk/extensions/SocialProfile/UserGifts/UserGiftsClass.php
Modified: trunk/extensions/SocialProfile/UserGifts/GiftsClass.php
===
--- trunk/extensions/SocialProfile/UserGifts/GiftsClass.php 2010-02-28
21:28:04 UTC (rev 63100)
+++ trunk/extensions/SocialProfile/UserGifts/GiftsClass.php 2010-02-28
21:40:31 UTC (rev 63101)
@@ -1,7 +1,8 @@
insert( 'gift',
+ $dbw->insert(
+ 'gift',
array(
'gift_name' => $gift_name,
'gift_description' => $gift_description,
- 'gift_createdate' => date( "Y-m-d H:i:s" ),
+ 'gift_createdate' => date( 'Y-m-d H:i:s' ),
'gift_creator_user_id' => $wgUser->getID(),
'gift_creator_user_name' => $wgUser->getName(),
'gift_access' => $gift_access,
@@ -74,15 +76,22 @@
* @return Gift information, including ID number, name, description,
creator's user name and ID and gift access
*/
static function getGift( $id ) {
- if ( !is_numeric( $id ) )
+ if ( !is_numeric( $id ) ) {
return '';
+ }
$dbr = wfGetDB( DB_SLAVE );
- $sql = "SELECT gift_id, gift_name, gift_description,
- gift_creator_user_id, gift_creator_user_name,
gift_access
- FROM {$dbr->tableName( 'gift' )} WHERE gift_id = {$id}
LIMIT 0,1";
- $res = $dbr->query( $sql );
+ $res = $dbr->select(
+ 'gift',
+ array(
+ 'gift_id', 'gift_name', 'gift_description',
+ 'gift_creator_user_id',
'gift_creator_user_name', 'gift_access'
+ ),
+ array( "gift_id = {$id}" ),
+ __METHOD__,
+ array( 'LIMIT' => 1, 'OFFSET' => 0 )
+ );
$row = $dbr->fetchObject( $res );
- $gift = '';
+ $gift = array();
if ( $row ) {
$gift['gift_id'] = $row->gift_id;
$gift['gift_name'] = $row->gift_name;
@@ -110,22 +119,31 @@
global $wgUser;
$dbr = wfGetDB( DB_SLAVE );
+ $params = array();
if ( $limit > 0 ) {
$limitvalue = 0;
- if ( $page ) $limitvalue = $page * $limit - ( $limit );
- $limit_sql = " LIMIT {$limitvalue},{$limit} ";
+ if ( $page ) {
+ $limitvalue = $page * $limit - ( $limit );
+ }
+ $params['LIMIT'] = $limit;
+ $params['OFFSET'] = $limitvalue;
}
- $sql = "SELECT
gift_id,gift_createdate,gift_name,gift_description,gift_given_count
- FROM {$dbr->tableName( 'gift' )}
- WHERE gift_access=0 OR gift_creator_user_id =
{$wgUser->getID()}
- ORDER BY {$order}
- {$limit_sql}";
+ $params['ORDER BY'] = $order;
+ $res = $dbr->select(
+ 'gift',
+ array(
+ 'gift_id', 'gift_createdate', 'gift_name',
'gift_description',
+ 'gift_given_count'
+ ),
+ array( "gift_access = 0 OR gift_creator_user_id =
{$wgUser->getID()}" ),
+ __METHOD__,
+ $params
+ );
- $res = $dbr->query( $sql );
$gifts = array();
- while ( $row = $dbr->fetchObject( $res ) ) {
+ foreach ( $res as $row ) {
$gifts[] = array(
'id' => $row->gift_id,
'timestamp' => ( $row->gift_createdate ),
@@ -143,24 +161,32 @@
$where = ''; // Prevent E_NOTICE
$params['ORDER BY'] = 'gift_createdate';
- if ( $limit )
+ if ( $limit ) {
$params['LIMIT'] = $limit;
+ }
- // If the user isn't in giftadmin group and isn't allowed to
delete pages, only show them the gifts they've created
- if ( !in_array( 'giftadmin', (
[MediaWiki-CVS] SVN: [63100] branches/js2-work/phase3/js/mwEmbed/skins
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/63100
Revision: 63100
Author: dale
Date: 2010-02-28 21:28:04 + (Sun, 28 Feb 2010)
Log Message:
---
* fixed low resolution display of menu overlay
* fixed switching playback-engine overlay menu options screen updates.
Modified Paths:
--
branches/js2-work/phase3/js/mwEmbed/skins/ctrlBuilder.js
branches/js2-work/phase3/js/mwEmbed/skins/kskin/kskinConfig.js
Modified: branches/js2-work/phase3/js/mwEmbed/skins/ctrlBuilder.js
===
--- branches/js2-work/phase3/js/mwEmbed/skins/ctrlBuilder.js2010-02-28
21:27:38 UTC (rev 63099)
+++ branches/js2-work/phase3/js/mwEmbed/skins/ctrlBuilder.js2010-02-28
21:28:04 UTC (rev 63100)
@@ -89,11 +89,11 @@
// Set up local ctrlBuilder
var _this = this;
- // Remove any old controls:
- embedPlayer.$interface.find( '.control-bar' ).remove();
+ // Remove any old controls & old overlays:
+ embedPlayer.$interface.find( '.control-bar,.overlay-win'
).remove();
// Setup the controlBar container
- var $controlBar = $j('')
+ var $controlBar = $j('')
.addClass( 'ui-state-default ui-widget-header
ui-helper-clearfix control-bar' )
.css( 'height', this.height )
@@ -996,7 +996,7 @@
* @param {Object} $target jQuery target for output
*/
getPlayerSelect: function( ) {
- mw.log('getPlayerSelect');
+ mw.log('getPlayerSelect::');
var embedPlayer = this.embedPlayer;
Modified: branches/js2-work/phase3/js/mwEmbed/skins/kskin/kskinConfig.js
===
--- branches/js2-work/phase3/js/mwEmbed/skins/kskin/kskinConfig.js
2010-02-28 21:27:38 UTC (rev 63099)
+++ branches/js2-work/phase3/js/mwEmbed/skins/kskin/kskinConfig.js
2010-02-28 21:28:04 UTC (rev 63100)
@@ -60,22 +60,27 @@
var embedPlayer = ctrlObj.embedPlayer;
$menuOverlay = $j( '')
- .addClass( 'k-menu ui-widget-content' )
+ .addClass( 'overlay-win k-menu
ui-widget-content' )
.css( {
'width' : '100%',
'position': 'absolute',
'top' : '0px',
'bottom' : (
ctrlObj.getHeight() + 2 ) + 'px'
} );
-
- if( embedPlayer.getPlayerHeight() == '0' ){
- $menuOverlay.css( "height",
ctrlObj.getOverlayHeight() )
- }
+
// Setup menu offset ( if player height <
getOverlayHeight )
// This displays the menu outside of the player
on small embeds
if ( embedPlayer.getPlayerHeight() <
ctrlObj.getOverlayHeight() ) {
-
- $menuOverlay.css( 'top', parseInt(
embedPlayer.getPlayerHeight() + ctrlObj.getHeight() ) + 'px' );
+ var topPos = (
ctrlObj.checkOverlayControls() )
+ ?
embedPlayer.getPlayerHeight()
+ :
embedPlayer.getPlayerHeight() + ctrlObj.getHeight();
+
+ $menuOverlay.css( {
+ 'top' : topPos + 'px',
+ 'bottom' : null,
+ 'height' :
ctrlObj.getOverlayHeight() + 'px'
+ });
+
// Special common overflow hack for
thumbnail display of player
$j( embedPlayer ).parents(
'.thumbinner' ).css( 'overflow', 'visible' );
___
MediaWiki-CVS mailing list
MediaWiki-C
[MediaWiki-CVS] SVN: [63099] trunk/extensions/SocialProfile/SystemGifts/ UserSystemGiftsClass.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/63099
Revision: 63099
Author: ashley
Date: 2010-02-28 21:27:38 + (Sun, 28 Feb 2010)
Log Message:
---
SocialProfile: forgot one SystemGifts file
Modified Paths:
--
trunk/extensions/SocialProfile/SystemGifts/UserSystemGiftsClass.php
Modified: trunk/extensions/SocialProfile/SystemGifts/UserSystemGiftsClass.php
===
--- trunk/extensions/SocialProfile/SystemGifts/UserSystemGiftsClass.php
2010-02-28 21:22:06 UTC (rev 63098)
+++ trunk/extensions/SocialProfile/SystemGifts/UserSystemGiftsClass.php
2010-02-28 21:27:38 UTC (rev 63099)
@@ -28,16 +28,19 @@
public function sendSystemGift( $gift_id, $email = true ) {
global $wgMemc;
- if ( $this->doesUserHaveGift( $this->user_id, $gift_id ) )
return '';
+ if ( $this->doesUserHaveGift( $this->user_id, $gift_id ) ) {
+ return '';
+ }
$dbw = wfGetDB( DB_MASTER );
- $dbw->insert( 'user_system_gift',
+ $dbw->insert(
+ 'user_system_gift',
array(
'sg_gift_id' => $gift_id,
'sg_user_id' => $this->user_id,
'sg_user_name' => $this->user_name,
'sg_status' => 1,
- 'sg_date' => date( "Y-m-d H:i:s" ),
+ 'sg_date' => date( 'Y-m-d H:i:s' ),
),
__METHOD__
);
@@ -47,17 +50,19 @@
// Add to new gift count cache for receiving user
$this->incNewSystemGiftCount( $this->user_id );
- if ( $email && !empty( $sg_gift_id ) )
$this->sendGiftNotificationEmail( $this->user_id, $gift_id );
+ if ( $email && !empty( $sg_gift_id ) ) {
+ $this->sendGiftNotificationEmail( $this->user_id,
$gift_id );
+ }
$wgMemc->delete( wfMemcKey( 'user', 'profile', 'system_gifts',
$this->user_id ) );
return $sg_gift_id;
}
public function sendGiftNotificationEmail( $user_id_to, $gift_id ) {
- wfLoadExtensionMessages( 'SystemGifts' );
$gift = SystemGifts::getGift( $gift_id );
$user = User::newFromId( $user_id_to );
$user->loadFromDatabase();
if ( $user->isEmailConfirmed() && $user->getIntOption(
'notifygift', 1 ) ) {
+ wfLoadExtensionMessages( 'SystemGifts' );
$gifts_link = SpecialPage::getTitleFor(
'ViewSystemGifts' );
$update_profile_link = SpecialPage::getTitleFor(
'UpdateProfile' );
$subject = wfMsgExt( 'system_gift_received_subject',
'parsemag',
@@ -77,7 +82,12 @@
public function doesUserHaveGift( $user_id, $gift_id ) {
$dbr = wfGetDB( DB_SLAVE );
- $s = $dbr->selectRow( 'user_system_gift', array( 'sg_status' ),
array( 'sg_user_id' => $user_id, 'sg_gift_id' => $gift_id ), __METHOD__ );
+ $s = $dbr->selectRow(
+ 'user_system_gift',
+ array( 'sg_status' ),
+ array( 'sg_user_id' => $user_id, 'sg_gift_id' =>
$gift_id ),
+ __METHOD__
+ );
if ( $s !== false ) {
return true;
}
@@ -87,11 +97,9 @@
public function clearAllUserSystemGiftStatus() {
$dbw = wfGetDB( DB_MASTER );
$dbw->update( 'user_system_gift',
- array( /* SET */
- 'sg_status' => 0
- ), array( /* WHERE */
- 'sg_user_id' => $this->user_id
- ), __METHOD__
+ /* SET */array( 'sg_status' => 0 ),
+ /* WHERE */array( 'sg_user_id' => $this->user_id ),
+ __METHOD__
);
$this->clearNewSystemGiftCountCache( $this->user_id );
}
@@ -99,17 +107,20 @@
static function clearUserGiftStatus( $id ) {
$dbw = wfGetDB( DB_MASTER );
$dbw->update( 'user_system_gift',
- array( /* SET */
- 'sg_status' => 0
- ), array( /* WHERE */
- 'sg_id' => $id
- ), __METHOD__
+ /* SET */array( 'sg_status' => 0 ),
+ /* WHERE */array( 'sg_id' => $id ),
+ __METHOD__
);
}
public function doesUserOwnGift( $user_id, $sg_id ) {
$dbr = wfGetDB( DB_SLAVE );
- $s = $dbr->selectRow( 'user_system_gif
[MediaWiki-CVS] SVN: [63098] trunk/extensions/SocialProfile/SystemGifts
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/63098
Revision: 63098
Author: ashley
Date: 2010-02-28 21:22:06 + (Sun, 28 Feb 2010)
Log Message:
---
SocialProfile: rewrote some DB queries, documented some functions and did
general cleanup to SystemGifts
Modified Paths:
--
trunk/extensions/SocialProfile/SystemGifts/SpecialViewSystemGift.php
trunk/extensions/SocialProfile/SystemGifts/SystemGiftsClass.php
Modified: trunk/extensions/SocialProfile/SystemGifts/SpecialViewSystemGift.php
===
--- trunk/extensions/SocialProfile/SystemGifts/SpecialViewSystemGift.php
2010-02-28 21:16:38 UTC (rev 63097)
+++ trunk/extensions/SocialProfile/SystemGifts/SpecialViewSystemGift.php
2010-02-28 21:22:06 UTC (rev 63098)
@@ -15,10 +15,10 @@
* @param $par Mixed: parameter passed to the page or null
*/
public function execute( $par ) {
- global $wgUser, $wgOut, $wgRequest, $wgUploadPath,
$wgSystemGiftsScripts, $wgDBprefix;
+ global $wgUser, $wgOut, $wgRequest, $wgUploadPath,
$wgSystemGiftsScripts;
wfLoadExtensionMessages( 'SystemGifts' );
- $wgOut->addStyle( '../..' . $wgSystemGiftsScripts .
'/SystemGift.css' );
+ $wgOut->addExtensionStyle( $wgSystemGiftsScripts .
'/SystemGift.css' );
$output = ''; // Prevent E_NOTICE
$user_name = ''; // Prevent E_NOTICE
@@ -30,17 +30,15 @@
return false;
}
- if ( !$user_name ) $user_name = $wgUser->getName();
+ if ( !$user_name ) {
+ $user_name = $wgUser->getName();
+ }
$gift = UserSystemGifts::getUserGift( $gift_id );
$id = User::idFromName( $user_name );
$user_safe = urlencode( $gift['user_name'] );
- // DB stuff
- $dbr = wfGetDB( DB_MASTER );
-
if ( $gift ) {
-
if ( $gift['status'] == 1 ) {
if ( $gift['user_name'] == $wgUser->getName() )
{
$g = new UserSystemGifts(
$gift['user_name'] );
@@ -48,45 +46,65 @@
$g->decNewSystemGiftCount(
$wgUser->getID() );
}
}
- $sql = "SELECT DISTINCT sg_user_name, sg_user_id,
sg_gift_id, sg_date FROM " . $wgDBprefix . "user_system_gift WHERE
sg_gift_id={$gift["gift_id"]} AND sg_user_name<>'" . addslashes(
$gift['user_name'] ) . "' GROUP BY sg_user_name ORDER BY sg_date DESC LIMIT
0,6";
- $res = $dbr->query( $sql );
+ // DB stuff
+ $dbr = wfGetDB( DB_MASTER );
+ $res = $dbr->select(
+ 'user_system_gift',
+ array(
+ 'DISTINCT sg_user_name', 'sg_user_id',
'sg_gift_id',
+ 'sg_date'
+ ),
+ array(
+ "sg_gift_id = {$gift['gift_id']}",
+ "sg_user_name <> '" . $dbr->strencode(
$gift['user_name'] ) . "'"
+ ),
+ __METHOD__,
+ array(
+ 'GROUP BY' => 'sg_user_name',
+ 'ORDER BY' => 'sg_date DESC',
+ 'OFFSET' => 0,
+ 'LIMIT' => 6
+ )
+ );
$output .= $wgOut->setPageTitle( wfMsg(
'ga-gift-title', $gift['user_name'], $gift['name'] ) );
- $output .= '
- ' . wfMsg( 'ga-back-link', Title::makeTitle(
NS_USER, $gift['user_name'] )->escapeFullURL(), $gift['user_name'] ) . '
- ';
+ $output .= ''
+ . wfMsg( 'ga-back-link', Title::makeTitle(
NS_USER, $gift['user_name'] )->escapeFullURL(), $gift['user_name'] ) .
+ '';
$message = $wgOut->parse( trim( $gift['description'] ),
false );
$output .= '';
- $gift_image = "";
+ $gift_image = "';
- $output .= "
+ $output .= "
{$gift_image}
- {$gift["name"]}
- ({$gift["timestamp"]})
+ {$gift['name']}
+ ({$gift['ti
[MediaWiki-CVS] SVN: [63097] trunk/extensions/AmazonPlus/AmazonPlus.i18n.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/63097 Revision: 63097 Author: siebrand Date: 2010-02-28 21:16:38 + (Sun, 28 Feb 2010) Log Message: --- Fix capitalisation Modified Paths: -- trunk/extensions/AmazonPlus/AmazonPlus.i18n.php Modified: trunk/extensions/AmazonPlus/AmazonPlus.i18n.php === --- trunk/extensions/AmazonPlus/AmazonPlus.i18n.php 2010-02-28 21:14:38 UTC (rev 63096) +++ trunk/extensions/AmazonPlus/AmazonPlus.i18n.php 2010-02-28 21:16:38 UTC (rev 63097) @@ -22,7 +22,7 @@ 'amazonplus-french' => 'French', 'amazonplus-japanese' => 'Japanese', 'amazonplus-english' => '', - 'amazonplus-amazon' => 'amazon price', + 'amazonplus-amazon' => 'Amazon price', 'amazonplus-new' => 'new', 'amazonplus-status' => '($1)', 'amazonplus-none' => 'No copies of this item are up for sale.', ___ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [63096] trunk/extensions/Translate/groups/Wikiblame.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/63096 Revision: 63096 Author: siebrand Date: 2010-02-28 21:14:38 + (Sun, 28 Feb 2010) Log Message: --- Update optionals Modified Paths: -- trunk/extensions/Translate/groups/Wikiblame.php Modified: trunk/extensions/Translate/groups/Wikiblame.php === --- trunk/extensions/Translate/groups/Wikiblame.php 2010-02-28 21:01:42 UTC (rev 63095) +++ trunk/extensions/Translate/groups/Wikiblame.php 2010-02-28 21:14:38 UTC (rev 63096) @@ -25,6 +25,7 @@ 'messages\\x5b\'contact_link\'\\x5d', 'messages\\x5b\'lang_example\'\\x5d', 'messages\\x5b\'project_example\'\\x5d', + 'messages\\x5b\'binary in wp\'\\x5d', ); public $header = 'https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [63095] trunk/extensions/Translate/groups/Wikia/extensions.txt
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/63095 Revision: 63095 Author: siebrand Date: 2010-02-28 21:01:42 + (Sun, 28 Feb 2010) Log Message: --- Update extension list Modified Paths: -- trunk/extensions/Translate/groups/Wikia/extensions.txt Modified: trunk/extensions/Translate/groups/Wikia/extensions.txt === --- trunk/extensions/Translate/groups/Wikia/extensions.txt 2010-02-28 21:01:10 UTC (rev 63094) +++ trunk/extensions/Translate/groups/Wikia/extensions.txt 2010-02-28 21:01:42 UTC (rev 63095) @@ -188,9 +188,6 @@ Wikia Video Add file = VideoEmbedTool/WikiaVideoAdd.i18n.php -Webtools -file = Webtools/SpecialWebtools.i18n.php - Where Is Extension file = WhereIsExtension/SpecialWhereIsExtension.i18n.php ___ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [63094] trunk/extensions/UsabilityInitiative
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/63094
Revision: 63094
Author: catrope
Date: 2010-02-28 21:01:10 + (Sun, 28 Feb 2010)
Log Message:
---
UsabilityInitiative: Make sure templates are wrapped/unwrapped when they become
collapsible/non-collapsible
* Refactor most of stylize() into wrapTemplate()
* Add afterWrap, onSkip and beforeUnwrap handlers that call wrapTemplate() and
unwrapTemplate()
* Change CSS so non-collapsed templates don't get styled as such
* Fix highlighter for cases where the text it was trying to wrap was exactly
equal to the contents of the encompassing node
Modified Paths:
--
trunk/extensions/UsabilityInitiative/UsabilityInitiative.hooks.php
trunk/extensions/UsabilityInitiative/js/plugins/jquery.wikiEditor.highlight.js
trunk/extensions/UsabilityInitiative/js/plugins/jquery.wikiEditor.html
trunk/extensions/UsabilityInitiative/js/plugins/jquery.wikiEditor.templateEditor.js
trunk/extensions/UsabilityInitiative/js/plugins.combined.js
trunk/extensions/UsabilityInitiative/js/plugins.combined.min.js
Modified: trunk/extensions/UsabilityInitiative/UsabilityInitiative.hooks.php
===
--- trunk/extensions/UsabilityInitiative/UsabilityInitiative.hooks.php
2010-02-28 20:36:33 UTC (rev 63093)
+++ trunk/extensions/UsabilityInitiative/UsabilityInitiative.hooks.php
2010-02-28 21:01:10 UTC (rev 63094)
@@ -74,19 +74,19 @@
array( 'src' =>
'js/plugins/jquery.suggestions.js', 'version' => 7 ),
array( 'src' =>
'js/plugins/jquery.textSelection.js', 'version' => 27 ),
array( 'src' =>
'js/plugins/jquery.wikiEditor.js', 'version' => 157 ),
- array( 'src' =>
'js/plugins/jquery.wikiEditor.highlight.js', 'version' => 35 ),
+ array( 'src' =>
'js/plugins/jquery.wikiEditor.highlight.js', 'version' => 36 ),
array( 'src' =>
'js/plugins/jquery.wikiEditor.toolbar.js', 'version' => 52 ),
array( 'src' =>
'js/plugins/jquery.wikiEditor.dialogs.js', 'version' => 19 ),
array( 'src' =>
'js/plugins/jquery.wikiEditor.toc.js', 'version' => 95 ),
array( 'src' =>
'js/plugins/jquery.wikiEditor.preview.js', 'version' => 11 ),
- array( 'src' =>
'js/plugins/jquery.wikiEditor.templateEditor.js', 'version' => 26 ),
+ array( 'src' =>
'js/plugins/jquery.wikiEditor.templateEditor.js', 'version' => 27 ),
array( 'src' =>
'js/plugins/jquery.wikiEditor.publish.js', 'version' => 3 ),
),
'combined' => array(
- array( 'src' => 'js/plugins.combined.js',
'version' => 293 ),
+ array( 'src' => 'js/plugins.combined.js',
'version' => 294 ),
),
'minified' => array(
- array( 'src' => 'js/plugins.combined.min.js',
'version' => 293 ),
+ array( 'src' => 'js/plugins.combined.min.js',
'version' => 294 ),
),
),
);
Modified:
trunk/extensions/UsabilityInitiative/js/plugins/jquery.wikiEditor.highlight.js
===
---
trunk/extensions/UsabilityInitiative/js/plugins/jquery.wikiEditor.highlight.js
2010-02-28 20:36:33 UTC (rev 63093)
+++
trunk/extensions/UsabilityInitiative/js/plugins/jquery.wikiEditor.highlight.js
2010-02-28 21:01:10 UTC (rev 63094)
@@ -219,16 +219,18 @@
}
var end = markers[i].end;
- var e = context.fn.getOffset( end );
+ // To avoid ending up at the first char of the next
node, we grab the offset for end - 1
+ // and add one to the offset
+ var e = context.fn.getOffset( end - 1 );
if ( !e ) {
// This shouldn't happen
continue;
}
var endNode = e.node;
var endDepth = e.depth;
- if ( e.offset < e.length - 1 && e.node.nodeName ==
'#text' ) {
+ if ( e.offset + 1 < e.length - 1 && e.node.nodeName ==
'#text' ) {
// Split off the suffix. This puts the suffix
in a new node and leaves the rest in endNode
- endNode.splitText( e.offset );
+ endNode.splitText( e.offset + 1 );
// This also invalidates cached offset objects
[MediaWiki-CVS] SVN: [63093] branches/new-installer/phase3/includes/db
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/63093 Revision: 63093 Author: demon Date: 2010-02-28 20:36:33 + (Sun, 28 Feb 2010) Log Message: --- Drop Schema constants for strings. List of acceptable ones are in Schema::$dataTypes. Modified Paths: -- branches/new-installer/phase3/includes/db/Schema.php branches/new-installer/phase3/includes/db/SchemaBuilder.php Modified: branches/new-installer/phase3/includes/db/Schema.php === --- branches/new-installer/phase3/includes/db/Schema.php2010-02-28 20:23:11 UTC (rev 63092) +++ branches/new-installer/phase3/includes/db/Schema.php2010-02-28 20:36:33 UTC (rev 63093) @@ -25,19 +25,8 @@ /** * Field types */ - const TYPE_INT = 1; - const TYPE_VARCHAR = 2; - const TYPE_DATETIME = 3; // On Postgres this is DATETIME. MySQL we use binary(14) - const TYPE_TEXT = 4; - const TYPE_BLOB = 5; - const TYPE_BINARY= 6; - const TYPE_VARBINARY = 7; - const TYPE_BOOL = 8; - const TYPE_ENUM = 9; - const TYPE_FLOAT = 10; - const TYPE_REAL = 11; - const TYPE_CHAR = 12; - const TYPE_NONE = 13; // omit type completely (for SQLite) + public static $dataTypes = array( 'int', 'varchar', 'datetime', 'text', 'blob', + 'binary', 'varbinary', 'bool', 'enum', 'float', 'real', 'char', 'none' ); /** * The actual database definition itself. A multi-dimensional associative @@ -55,74 +44,74 @@ 'prefix' => 'user', 'fields' => array( 'id' => array( - 'type' => self::TYPE_INT, + 'type' => 'int', 'null' => false, 'auto-increment' => true, 'primary-key'=> true, 'signed' => false, ), 'name' => array( - 'type'=> self::TYPE_VARCHAR, + 'type'=> 'varchar', 'length' => 255, 'null'=> false, 'binary' => true, 'default' => '', ), 'real_name' => array( - 'type'=> self::TYPE_VARCHAR, + 'type'=> 'varchar', 'length' => 255, 'null'=> false, 'binary' => true, 'default' => '', ), 'password' => array( - 'type' => self::TYPE_BLOB, + 'type' => 'blob', 'length' => 'tiny', 'null' => false, ), 'new_password' => array( - 'type' => self::TYPE_BLOB, + 'type' => 'blob', 'length' => 'tiny', 'null' => false, ), 'newpass_time' => array( - 'type' => self::TYPE_DATETIME, + 'type' => 'datetime', ), 'email' => array( - 'type' => self::TYPE_TEXT, + 'type' => 'text', 'length' => 'tiny', 'null' => false, ), 'options' => array( - 'type' => self::TYPE_BLOB, + 'type' => 'blob', 'null' => false, ), 'touched' => array( - 'type'=> self::TYPE_DATETIME, + 'type'=> 'datetime', 'null'=> false, 'default' => '', ),
[MediaWiki-CVS] SVN: [63092] trunk/extensions/Storyboard/api/ApiStoryboardStoriesFeed.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/63092 Revision: 63092 Author: jeroendedauw Date: 2010-02-28 20:23:11 + (Sun, 28 Feb 2010) Log Message: --- Fixed error from 63091 Modified Paths: -- trunk/extensions/Storyboard/api/ApiStoryboardStoriesFeed.php Modified: trunk/extensions/Storyboard/api/ApiStoryboardStoriesFeed.php === --- trunk/extensions/Storyboard/api/ApiStoryboardStoriesFeed.php 2010-02-28 20:13:18 UTC (rev 63091) +++ trunk/extensions/Storyboard/api/ApiStoryboardStoriesFeed.php 2010-02-28 20:23:11 UTC (rev 63092) @@ -66,9 +66,9 @@ 'id' => $story->story_id, 'author' => $story->story_author_name, 'title' => $story->story_title, + 'text' => $story->story_text, 'created' => wfTimestamp( TS_ISO_8601, $story->story_created ), ); - ApiResult::setContent( $res, $story->story_text ); $this->getResult()->addValue( array( 'query', $this->getModuleName() ), null, $res ); } ___ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [63091] trunk/extensions/Storyboard
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/63091
Revision: 63091
Author: jeroendedauw
Date: 2010-02-28 20:13:18 + (Sun, 28 Feb 2010)
Log Message:
---
Modifications for getting storyboard content
Modified Paths:
--
trunk/extensions/Storyboard/api/ApiStoryboardStoriesFeed.php
trunk/extensions/Storyboard/tags/Storyboard/Storyboard_body.php
Modified: trunk/extensions/Storyboard/api/ApiStoryboardStoriesFeed.php
===
--- trunk/extensions/Storyboard/api/ApiStoryboardStoriesFeed.php
2010-02-28 19:53:20 UTC (rev 63090)
+++ trunk/extensions/Storyboard/api/ApiStoryboardStoriesFeed.php
2010-02-28 20:13:18 UTC (rev 63091)
@@ -52,7 +52,7 @@
'story_title',
'story_text',
'story_created'
- ) );
+ ) );
$this->addWhere( array(
'story_is_published' => 1
) );
@@ -62,9 +62,13 @@
$stories = $this->select( __METHOD__ );
while ( $story = $stories->fetchObject() ) {
- $res = array( 'id' => $story->story_id,
$story->story_title );
- $storyHtml = "$story->story_title$story->story_text";
- ApiResult::setContent( $res, $storyHtml );
+ $res = array(
+ 'id' => $story->story_id,
+ 'author' => $story->story_author_name,
+ 'title' => $story->story_title,
+ 'created' => wfTimestamp( TS_ISO_8601,
$story->story_created ),
+ );
+ ApiResult::setContent( $res, $story->story_text );
$this->getResult()->addValue( array( 'query',
$this->getModuleName() ), null, $res );
}
Modified: trunk/extensions/Storyboard/tags/Storyboard/Storyboard_body.php
===
--- trunk/extensions/Storyboard/tags/Storyboard/Storyboard_body.php
2010-02-28 19:53:20 UTC (rev 63090)
+++ trunk/extensions/Storyboard/tags/Storyboard/Storyboard_body.php
2010-02-28 20:13:18 UTC (rev 63091)
@@ -26,7 +26,7 @@
/**/
EOT;
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [63090] branches/new-installer/phase3/includes/db/SchemaBuilder.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/63090
Revision: 63090
Author: maxsem
Date: 2010-02-28 19:53:20 + (Sun, 28 Feb 2010)
Log Message:
---
Fixed index prefixes. Needs refactoring to reduce duplication?
Modified Paths:
--
branches/new-installer/phase3/includes/db/SchemaBuilder.php
Modified: branches/new-installer/phase3/includes/db/SchemaBuilder.php
===
--- branches/new-installer/phase3/includes/db/SchemaBuilder.php 2010-02-28
19:49:14 UTC (rev 63089)
+++ branches/new-installer/phase3/includes/db/SchemaBuilder.php 2010-02-28
19:53:20 UTC (rev 63090)
@@ -226,7 +226,7 @@
} else {
$sql .= "CREATE INDEX ";
}
- $sql .= "{$prefix}{$idx} ON $tblName (";
+ $sql .= "{$this->tblPrefix}{$idx} ON $tblName
(";
foreach( $idxDef as $col ) {
$sql .= "{$prefix}{$col},";
}
@@ -416,7 +416,7 @@
} else {
$sql .= "CREATE INDEX ";
}
- $sql .= "{$prefix}{$idx} ON $tblName (";
+ $sql .= "{$this->tblPrefix}{$idx} ON $tblName
(";
foreach( $idxDef as $col ) {
$sql .= "{$prefix}{$col},";
}
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [63089] branches/new-installer/phase3/includes
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/63089
Revision: 63089
Author: maxsem
Date: 2010-02-28 19:49:14 + (Sun, 28 Feb 2010)
Log Message:
---
Approximate SQlite schema
Modified Paths:
--
branches/new-installer/phase3/includes/AutoLoader.php
branches/new-installer/phase3/includes/db/SchemaBuilder.php
Modified: branches/new-installer/phase3/includes/AutoLoader.php
===
--- branches/new-installer/phase3/includes/AutoLoader.php 2010-02-28
19:45:50 UTC (rev 63088)
+++ branches/new-installer/phase3/includes/AutoLoader.php 2010-02-28
19:49:14 UTC (rev 63089)
@@ -349,6 +349,7 @@
'DatabaseOracle' => 'includes/db/DatabaseOracle.php',
'DatabasePostgres' => 'includes/db/DatabasePostgres.php',
'DatabaseSqlite' => 'includes/db/DatabaseSqlite.php',
+ 'DatabaseSqliteStandalone' => 'includes/db/DatabaseSqlite.php',
'DBConnectionError' => 'includes/db/Database.php',
'DBError' => 'includes/db/Database.php',
'DBObject' => 'includes/db/Database.php',
Modified: branches/new-installer/phase3/includes/db/SchemaBuilder.php
===
--- branches/new-installer/phase3/includes/db/SchemaBuilder.php 2010-02-28
19:45:50 UTC (rev 63088)
+++ branches/new-installer/phase3/includes/db/SchemaBuilder.php 2010-02-28
19:49:14 UTC (rev 63089)
@@ -341,26 +341,27 @@
class SqliteSchema extends SchemaBuilder {
static $typeMapping = array(
- TYPE_INT => 'INTEGER',
- TYPE_VARCHAR => 'TEXT',
- TYPE_DATETIME => 'TEXT',
- TYPE_TEXT => 'TEXT',
- TYPE_BLOB => 'BLOB',
- TYPE_BINARY=> 'BLOB',
- TYPE_VARBINARY => 'BLOB',
- TYPE_BOOL => 'INTEGER',
- TYPE_ENUM => 'BLOB',
- TYPE_FLOAT => 'REAL',
- TYPE_REAL => 'REAL',
- TYPE_CHAR => 'TEXT',
- TYPE_NONE => '',
+ Schema::TYPE_INT => 'INTEGER',
+ Schema::TYPE_VARCHAR => 'TEXT',
+ Schema::TYPE_DATETIME => 'TEXT',
+ Schema::TYPE_TEXT => 'TEXT',
+ Schema::TYPE_BLOB => 'BLOB',
+ Schema::TYPE_BINARY=> 'BLOB',
+ Schema::TYPE_VARBINARY => 'BLOB',
+ Schema::TYPE_BOOL => 'INTEGER',
+ Schema::TYPE_ENUM => 'BLOB',
+ Schema::TYPE_FLOAT => 'REAL',
+ Schema::TYPE_REAL => 'REAL',
+ Schema::TYPE_CHAR => 'TEXT',
+ Schema::TYPE_NONE => '',
);
/**
* @todo: update updatelog with fts3
*/
protected function addDatabaseSpecificTables() {
- $db = wfGetDB( DB_MASTER );
+ $tmpFile = tempnam( sys_get_temp_dir(), 'mw' );
+ $db = new DatabaseSqliteStandalone( $tmpFile );
if ( $db->getFulltextSearchModule() == 'FTS3' ) {
$this->tables['searchindex'] = array(
'prefix' => 'si',
@@ -387,6 +388,8 @@
)
);
}
+ $db->close();
+ unlink( $tmpFile );
}
protected function createTable( $name, $def ) {
@@ -434,6 +437,24 @@
if ( !isset( self::$typeMapping[$type] ) ) {
throw new MWException( "Unknown type $type" );
}
+ $def = self::$typeMapping[$type];
+ if( isset( $attribs['null'] ) ) {
+ $def .= $attribs['null'] ? ' NULL' : ' NOT
NULL';
+ }
+ // Use array_key_exists() since 'default' might be set to null
+ if( array_key_exists( 'default', $attribs ) ) {
+ if( $attribs['default'] === null ) {
+ $def .= ' default NULL';
+ } else {
+ $def .= " DEFAULT '" . $attribs['default'] .
"'";
+ }
+ } if( isset( $attribs['primary-key'] ) &&
$attribs['primary-key'] ) {
+ $def .= ' PRIMARY KEY';
+ }
+ if( isset( $attribs['auto-increment'] ) &&
$attribs['auto-increment'] ) {
+ $def .= ' AUTOINCREMENT';
+ }
+ return $def . ',';
}
protected function updateTable( $name, $definition, $db ) {
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [63087] trunk/extensions/Storyboard
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/63087
Revision: 63087
Author: jeroendedauw
Date: 2010-02-28 19:42:41 + (Sun, 28 Feb 2010)
Log Message:
---
Modifications for getting storyboard content
Modified Paths:
--
trunk/extensions/Storyboard/api/ApiStoryboardStoriesFeed.php
trunk/extensions/Storyboard/tags/Storyboard/Storyboard_body.php
trunk/extensions/Storyboard/tags/Storyboard/jquery.ajaxscroll.js
trunk/extensions/Storyboard/tags/Storyboard/storyboard.css
Modified: trunk/extensions/Storyboard/api/ApiStoryboardStoriesFeed.php
===
--- trunk/extensions/Storyboard/api/ApiStoryboardStoriesFeed.php
2010-02-28 19:34:23 UTC (rev 63086)
+++ trunk/extensions/Storyboard/api/ApiStoryboardStoriesFeed.php
2010-02-28 19:42:41 UTC (rev 63087)
@@ -47,6 +47,7 @@
$this->addTables( 'storyboard' );
$this->addFields( array(
+ 'story_id',
'story_author_name',
'story_title',
'story_text',
@@ -61,8 +62,13 @@
$stories = $this->select( __METHOD__ );
while ( $story = $stories->fetchObject() ) {
- // TODO: figure out how to output the data so the
storyboard can use it
+ $res = array( 'id' => $story->story_id,
$story->story_title );
+ $storyHtml = "$story->story_title$story->story_text";
+ ApiResult::setContent( $res, $storyHtml );
+ $this->getResult()->addValue( array( 'query',
$this->getModuleName() ), null, $res );
}
+
+ $this->getResult()->setIndexedTagName_internal( array( 'query',
$this->getModuleName() ), 'story' );
}
/**
Modified: trunk/extensions/Storyboard/tags/Storyboard/Storyboard_body.php
===
--- trunk/extensions/Storyboard/tags/Storyboard/Storyboard_body.php
2010-02-28 19:34:23 UTC (rev 63086)
+++ trunk/extensions/Storyboard/tags/Storyboard/Storyboard_body.php
2010-02-28 19:42:41 UTC (rev 63087)
@@ -23,10 +23,10 @@
$wgOut->addScriptFile($egStoryboardScriptPath .
'/tags/Storyboard/jquery.ajaxscroll.js');
$output = <<
+
/**/
EOT;
Modified: trunk/extensions/Storyboard/tags/Storyboard/jquery.ajaxscroll.js
===
--- trunk/extensions/Storyboard/tags/Storyboard/jquery.ajaxscroll.js
2010-02-28 19:34:23 UTC (rev 63086)
+++ trunk/extensions/Storyboard/tags/Storyboard/jquery.ajaxscroll.js
2010-02-28 19:42:41 UTC (rev 63087)
@@ -17,9 +17,9 @@
horizontal:false,
batchTemplate:null,
boxTemplate:null,
- batchClass:"batch",
- boxClass:"box",
- emptyBatchClass:"empty",
+ batchClass:"ajaxscroll-batch",
+ boxClass:"ajaxscroll-box",
+ emptyBatchClass:"ajaxscroll-empty",
scrollPaneClass:"scrollpane",
lBound:"auto",
uBound:"auto",
Modified: trunk/extensions/Storyboard/tags/Storyboard/storyboard.css
===
--- trunk/extensions/Storyboard/tags/Storyboard/storyboard.css 2010-02-28
19:34:23 UTC (rev 63086)
+++ trunk/extensions/Storyboard/tags/Storyboard/storyboard.css 2010-02-28
19:42:41 UTC (rev 63087)
@@ -10,11 +10,11 @@
.ajaxscroll {
border: 1px solid #ddd;
}
-.ajaxscroll .batch {
+.ajaxscroll .ajaxscroll-batch {
margin: 0;
padding: 0;
}
-.ajaxscroll .box {
+.ajaxscroll .ajaxscroll-box {
display: inline-block;
border: 1px solid #eee;
width: 99%;
@@ -23,11 +23,7 @@
margin: 5px !important;
margin-bottom: 25px;
}
-.ajaxscroll .empty .box {
+.ajaxscroll .ajaxscroll-empty .ajaxscroll-box {
border: 1px solid #ddd;
background: #FCFCFC url(../../images/storyboard-loader.gif) no-repeat
scroll center center;
-}
-#storyboard {
- height: 400px;
- width: 80%;
}
\ No newline at end of file
___
MediaWiki-CVS ma
[MediaWiki-CVS] SVN: [63086] trunk/phase3/includes/Preferences.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/63086
Revision: 63086
Author: simetrical
Date: 2010-02-28 19:34:23 + (Sun, 28 Feb 2010)
Log Message:
---
Spell variables correctly
Modified Paths:
--
trunk/phase3/includes/Preferences.php
Modified: trunk/phase3/includes/Preferences.php
===
--- trunk/phase3/includes/Preferences.php 2010-02-28 17:38:26 UTC (rev
63085)
+++ trunk/phase3/includes/Preferences.php 2010-02-28 19:34:23 UTC (rev
63086)
@@ -1261,18 +1261,18 @@
);
if( $wgEnableEmail ) {
- $newadr = $formData['emailaddress'];
- $oldadr = $wgUser->getEmail();
- if( ( $newadr != '' ) && ( $newadr != $oldadr ) ) {
+ $newaddr = $formData['emailaddress'];
+ $oldaddr = $wgUser->getEmail();
+ if( ( $newaddr != '' ) && ( $newaddr != $oldaddr ) ) {
# the user has supplied a new email address on
the login page
# new behaviour: set this new emailaddr from
login-page into user database record
- $wgUser->setEmail( $newadr );
+ $wgUser->setEmail( $newaddr );
# but flag as "dirty" = unauthenticated
$wgUser->invalidateEmail();
if( $wgEmailAuthentication ) {
# Mail a temporary password to the
dirty address.
# User can come back through the
confirmation URL to re-enable email.
- $result =
$wgUser->sendConfirmationMail( $oldadr != '' );
+ $result =
$wgUser->sendConfirmationMail( $oldaddr != '' );
if( WikiError::isError( $result ) ) {
return wfMsg( 'mailerror',
htmlspecialchars( $result->getMessage() ) );
} elseif( $entryPoint == 'ui' ) {
@@ -1280,10 +1280,10 @@
}
}
} else {
- $wgUser->setEmail( $newadr );
+ $wgUser->setEmail( $newaddr );
}
- if( $oldadr != $newadr ) {
- wfRunHooks( 'PrefsEmailAudit', array( $wgUser,
$oldadr, $newadr ) );
+ if( $oldaddr != $newaddr ) {
+ wfRunHooks( 'PrefsEmailAudit', array( $wgUser,
$oldaddr, $newaddr ) );
}
}
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [63085] trunk/phase3/includes/FormOptions.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/63085
Revision: 63085
Author: midom
Date: 2010-02-28 17:38:26 + (Sun, 28 Feb 2010)
Log Message:
---
per http://lt.php.net/ArrayAccess, offsetSet and offsetUnset ar both void and
shouldn't be returning data
Modified Paths:
--
trunk/phase3/includes/FormOptions.php
Modified: trunk/phase3/includes/FormOptions.php
===
--- trunk/phase3/includes/FormOptions.php 2010-02-28 17:34:20 UTC (rev
63084)
+++ trunk/phase3/includes/FormOptions.php 2010-02-28 17:38:26 UTC (rev
63085)
@@ -192,11 +192,11 @@
}
public function offsetSet( $name, $value ) {
- return $this->setValue( $name, $value );
+ $this->setValue( $name, $value );
}
public function offsetUnset( $name ) {
- return $this->delete( $name );
+ $this->delete( $name );
}
}
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [63084] branches/new-installer/phase3/includes/db
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/63084
Revision: 63084
Author: maxsem
Date: 2010-02-28 17:34:20 + (Sun, 28 Feb 2010)
Log Message:
---
Merged includes/db from trunk, I need it
Modified Paths:
--
branches/new-installer/phase3/includes/db/Database.php
branches/new-installer/phase3/includes/db/DatabaseIbm_db2.php
branches/new-installer/phase3/includes/db/DatabaseMssql.php
branches/new-installer/phase3/includes/db/DatabaseMysql.php
branches/new-installer/phase3/includes/db/DatabaseOracle.php
branches/new-installer/phase3/includes/db/DatabasePostgres.php
branches/new-installer/phase3/includes/db/DatabaseSqlite.php
branches/new-installer/phase3/includes/db/LBFactory.php
branches/new-installer/phase3/includes/db/LoadBalancer.php
Property Changed:
branches/new-installer/phase3/includes/db/
Property changes on: branches/new-installer/phase3/includes/db
___
Added: svn:mergeinfo
+ /trunk/phase3/includes/db:43664-63083
Modified: branches/new-installer/phase3/includes/db/Database.php
===
--- branches/new-installer/phase3/includes/db/Database.php 2010-02-28
17:21:08 UTC (rev 63083)
+++ branches/new-installer/phase3/includes/db/Database.php 2010-02-28
17:34:20 UTC (rev 63084)
@@ -284,6 +284,11 @@
}
}
+ /**
+* Get the type of the DBMS, as it appears in $wgDBtype.
+*/
+ abstract function getType();
+
#--
# Other functions
#--
@@ -422,7 +427,7 @@
* Should return true if unsure.
*/
function isWriteQuery( $sql ) {
- return !preg_match( '/^(?:SELECT|BEGIN|COMMIT|SET|SHOW)\b/i',
$sql );
+ return !preg_match(
'/^(?:SELECT|BEGIN|COMMIT|SET|SHOW|\(SELECT)\b/i', $sql );
}
/**
@@ -2223,7 +2228,7 @@
}
}
- if ( '' != $cmd ) { $cmd .= ' '; }
+ if ( $cmd != '' ) { $cmd .= ' '; }
$cmd .= "$line\n";
if ( $done ) {
@@ -2619,8 +2624,6 @@
-http://www.google.com/logos/Logo_40wht.gif"; alt=""
style="float:left; margin-left: 1.5em; margin-right: 1.5em;" />
-
@@ -2853,4 +2856,4 @@
public function toString() {
return $this->str;
}
-}
\ No newline at end of file
+}
Modified: branches/new-installer/phase3/includes/db/DatabaseIbm_db2.php
===
--- branches/new-installer/phase3/includes/db/DatabaseIbm_db2.php
2010-02-28 17:21:08 UTC (rev 63083)
+++ branches/new-installer/phase3/includes/db/DatabaseIbm_db2.php
2010-02-28 17:34:20 UTC (rev 63084)
@@ -21,9 +21,9 @@
/**
* Builder method for the class
-* @param DatabaseIbm_db2 $db Database interface
-* @param string $table table name
-* @param string $field column name
+* @param $db DatabaseIbm_db2: Database interface
+* @param $table String: table name
+* @param $field String: column name
* @return IBM_DB2Field
*/
static function fromText($db, $table, $field) {
@@ -391,8 +391,11 @@
return $this->mDBname;
}
}
+
+ function getType() {
+ return 'ibm_db2';
+ }
-
##
# Setup
##
@@ -400,12 +403,13 @@
/**
*
-* @param string $server hostname of database server
-* @param string $user username
-* @param string $password
-* @param string $dbName database name on the server
-* @param function $failFunction (optional)
-* @param integer $flags database behaviour flags (optional, unused)
+* @param $server String: hostname of database server
+* @param $user String: username
+* @param $password String: password
+* @param $dbName String: database name on the server
+* @param $failFunction Callback (optional)
+* @param $flags Integer: database behaviour flags (optional, unused)
+* @param $schema String
*/
public function DatabaseIbm_db2($server = false, $user = false,
$password = false,
$dbName = false,
$failFunction = false, $flags = 0,
@@ -438,9 +442,9 @@
/**
* Enables options only if the ibm_db2 extension version supports them
-* @param string $name Name of the option in the options array
-
[MediaWiki-CVS] SVN: [63083] branches/new-installer/phase3/includes/db
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/63083 Revision: 63083 Author: maxsem Date: 2010-02-28 17:21:08 + (Sun, 28 Feb 2010) Log Message: --- Moved table options to MySQL schema, made it work without default table options set Modified Paths: -- branches/new-installer/phase3/includes/db/Schema.php branches/new-installer/phase3/includes/db/SchemaBuilder.php Modified: branches/new-installer/phase3/includes/db/Schema.php === --- branches/new-installer/phase3/includes/db/Schema.php2010-02-28 16:56:36 UTC (rev 63082) +++ branches/new-installer/phase3/includes/db/Schema.php2010-02-28 17:21:08 UTC (rev 63083) @@ -373,10 +373,6 @@ 'user_text', 'timestamp', ), ), - 'options' => array( - 'max_rows' => 1000, - 'avg_row_length' => 1024, - ), ), 'text' => array( 'prefix' => 'old', @@ -400,10 +396,6 @@ ), ), 'indexes' => array(), - 'options' => array( - 'max_rows' => 1000, - 'avg_row_length' => 10240, - ), ), 'archive' => array( 'prefix' => 'ar', @@ -816,10 +808,6 @@ 'null' => false, ), ), - 'options' => array( - 'max_rows' => 25000, - 'engine' => 'HEAP', - ), ), 'ipblocks' => array( 'prefix' => 'ipb', Modified: branches/new-installer/phase3/includes/db/SchemaBuilder.php === --- branches/new-installer/phase3/includes/db/SchemaBuilder.php 2010-02-28 16:56:36 UTC (rev 63082) +++ branches/new-installer/phase3/includes/db/SchemaBuilder.php 2010-02-28 17:21:08 UTC (rev 63083) @@ -33,7 +33,7 @@ protected $tblPrefix = ''; // Any options for the table creation. Things like ENGINE=InnoDB - protected $tblOptions = ''; + protected $tblOptions = array(); // Our table definition protected $tables = array(); @@ -185,6 +185,21 @@ 'engine' => 'MyISAM', ), ); + + $this->tables['revision']['options'] = array( + 'max_rows' => 1000, + 'avg_row_length' => 1024, + ); + + $this->tables['text']['options'] = array( + 'max_rows' => 1000, + 'avg_row_length' => 10240, + ); + + $this->tables['hitcounter']['options'] = array( + 'max_rows' => 25000, + 'engine' => 'HEAP', + ); } /** ___ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [63082] trunk/phase3/languages/messages/MessagesMl.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/63082 Revision: 63082 Author: siebrand Date: 2010-02-28 16:56:36 + (Sun, 28 Feb 2010) Log Message: --- Update magic words from translatewiki.net Modified Paths: -- trunk/phase3/languages/messages/MessagesMl.php Modified: trunk/phase3/languages/messages/MessagesMl.php === --- trunk/phase3/languages/messages/MessagesMl.php 2010-02-28 16:52:26 UTC (rev 63081) +++ trunk/phase3/languages/messages/MessagesMl.php 2010-02-28 16:56:36 UTC (rev 63082) @@ -272,6 +272,7 @@ 'padleft' => array( '0', 'ഇടത്ത്നിറക്കുക', 'PADLEFT' ), 'padright' => array( '0', 'വലത്ത്നിറക്കുക', 'PADRIGHT' ), 'special' => array( '0', 'പ്രത്യേകം', 'special' ), + 'filepath' => array( '0', 'പ്രമാണപഥം:', 'FILEPATH:' ), 'tag' => array( '0', 'റ്റാഗ്', 'tag' ), 'hiddencat' => array( '1', '__മറഞ്ഞിരിക്കുംവർഗ്ഗം__', '__HIDDENCAT__' ), 'pagesincategory' => array( '1', 'വർഗ്ഗത്തിലുള്ളതാളുകൾ', 'PAGESINCATEGORY', 'PAGESINCAT' ), ___ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [63080] branches/new-installer/phase3/includes/installer
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/63080
Revision: 63080
Author: demon
Date: 2010-02-28 16:38:37 + (Sun, 28 Feb 2010)
Log Message:
---
Redo table options to be an array and fix searchindex, hitcounter, revision and
text to use them. Also fix constant refs
Modified Paths:
--
branches/new-installer/phase3/includes/installer/Schema.php
branches/new-installer/phase3/includes/installer/SchemaBuilder.php
Modified: branches/new-installer/phase3/includes/installer/Schema.php
===
--- branches/new-installer/phase3/includes/installer/Schema.php 2010-02-28
16:35:33 UTC (rev 63079)
+++ branches/new-installer/phase3/includes/installer/Schema.php 2010-02-28
16:38:37 UTC (rev 63080)
@@ -18,7 +18,6 @@
*
* @author Chad Horohoe
* @todo FOLLOWING TABLES NEED WORK:
- * -searchindex, hitcounter (custom table options)
* -externallinks, ipblocks, oldimage, job (indexes)
* -trackbacks, testitem (REFERENCES)
*/
@@ -374,6 +373,10 @@
'user_text', 'timestamp',
),
),
+ 'options' => array(
+ 'max_rows' => 1000,
+ 'avg_row_length' => 1024,
+ ),
),
'text' => array(
'prefix' => 'old',
@@ -397,6 +400,10 @@
),
),
'indexes' => array(),
+ 'options' => array(
+ 'max_rows' => 1000,
+ 'avg_row_length' => 10240,
+ ),
),
'archive' => array(
'prefix' => 'ar',
@@ -809,6 +816,10 @@
'null' => false,
),
),
+ 'options' => array(
+ 'max_rows' => 25000,
+ 'engine' => 'HEAP',
+ ),
),
'ipblocks' => array(
'prefix' => 'ipb',
Modified: branches/new-installer/phase3/includes/installer/SchemaBuilder.php
===
--- branches/new-installer/phase3/includes/installer/SchemaBuilder.php
2010-02-28 16:35:33 UTC (rev 63079)
+++ branches/new-installer/phase3/includes/installer/SchemaBuilder.php
2010-02-28 16:38:37 UTC (rev 63080)
@@ -115,24 +115,14 @@
}
/**
-* Set the prefix for all tables (unless they override this)
-*
-* @param $opts String The options for all tables, like ENGINE=InnoDB
+* Set the default table options for all tables
+* @param $opts Array of table options, like 'engine' => 'InnoDB', etc
*/
public function setTableOptions( $opts ) {
$this->tblOptions = $opts;
}
/**
-* Get table options
-*
-* @return String
-*/
- protected function getTableOptions() {
- return $this->tblOptions;
- }
-
- /**
* Given an abstract table definition, return a DBMS-specific command to
* create it.
* @param $name The name of the table, like 'page' or 'revision'
@@ -164,18 +154,18 @@
'prefix' => 'si',
'fields' => array(
'page' => array(
- 'type' => self::TYPE_INT,
+ 'type' => Schema::TYPE_INT,
'signed' => false,
'null' => false,
),
'title' => array(
- 'type'=> self::TYPE_VARCHAR,
+ 'type'=> Schema::TYPE_VARCHAR,
'length' => 255,
'null'=> false,
'default' => '',
),
'text' => array(
- 'type' => self::TYPE_TEXT,
+ 'type' => Schema::TYPE_TEXT,
'length' => 'medium',
'null' => false,
),
@@ -191,6 +181,9 @@
'FULLTEXT', 'text',
),
),
+ 'options' => array(
+ 'engine' => 'MyISAM',
+ ),
[MediaWiki-CVS] SVN: [63077] branches/new-installer/phase3/includes/installer
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/63077
Revision: 63077
Author: maxsem
Date: 2010-02-28 16:06:40 + (Sun, 28 Feb 2010)
Log Message:
---
Started working on SQLite schema, added a facility for different databases to
add their own tables to the schema
Modified Paths:
--
branches/new-installer/phase3/includes/installer/Schema.php
branches/new-installer/phase3/includes/installer/SchemaBuilder.php
Modified: branches/new-installer/phase3/includes/installer/Schema.php
===
--- branches/new-installer/phase3/includes/installer/Schema.php 2010-02-28
15:43:51 UTC (rev 63076)
+++ branches/new-installer/phase3/includes/installer/Schema.php 2010-02-28
16:06:40 UTC (rev 63077)
@@ -38,6 +38,7 @@
const TYPE_FLOAT = 10;
const TYPE_REAL = 11;
const TYPE_CHAR = 12;
+ const TYPE_NONE = 13; // omit type completely (for SQLite)
/**
* The actual database definition itself. A multi-dimensional
associative
@@ -1495,38 +1496,6 @@
),
),
),
- 'searchindex' => array(
- 'prefix' => 'si',
- 'fields' => array(
- 'page' => array(
- 'type' => self::TYPE_INT,
- 'signed' => false,
- 'null' => false,
- ),
- 'title' => array(
- 'type'=> self::TYPE_VARCHAR,
- 'length' => 255,
- 'null'=> false,
- 'default' => '',
- ),
- 'text' => array(
- 'type' => self::TYPE_TEXT,
- 'length' => 'medium',
- 'null' => false,
- ),
- ),
- 'indexes' => array(
- 'si_page' => array(
- 'UNIQUE', 'page',
- ),
- 'si_title' => array(
- 'FULLTEXT', 'title',
- ),
- 'si_text' => array(
- 'FULLTEXT', 'text',
- ),
- ),
- ),
'interwiki' => array(
'prefix' => 'iw',
'fields' => array(
Modified: branches/new-installer/phase3/includes/installer/SchemaBuilder.php
===
--- branches/new-installer/phase3/includes/installer/SchemaBuilder.php
2010-02-28 15:43:51 UTC (rev 63076)
+++ branches/new-installer/phase3/includes/installer/SchemaBuilder.php
2010-02-28 16:06:40 UTC (rev 63077)
@@ -47,6 +47,7 @@
private final function __construct( $schema ) {
wfRunHooks( 'LoadExtensionSchemaUpdates', array( &$schema ) );
$this->tables = $schema;
+ $this->addDatabaseSpecificTables();
}
/**
@@ -149,9 +150,50 @@
* @return String
*/
abstract protected function updateTable( $name, $definition, $db );
+
+ /**
+* Adds database-specific tables to the in-class list.
+* @return Nothing
+*/
+ abstract protected function addDatabaseSpecificTables();
}
class MysqlSchema extends SchemaBuilder {
+ protected function addDatabaseSpecificTables() {
+ $this->tables['searchindex'] = array(
+ 'prefix' => 'si',
+ 'fields' => array(
+ 'page' => array(
+ 'type' => self::TYPE_INT,
+ 'signed' => false,
+ 'null' => false,
+ ),
+ 'title' => array(
+ 'type'=> self::TYPE_VARCHAR,
+ 'length' => 255,
+ 'null'=> false,
+ 'default' => '',
+ ),
+ 'text' => array(
+ 'type' => self::TYPE_TEXT,
+ 'length' => 'medium',
+ 'null' => false,
+ ),
+ ),
+ 'i
[MediaWiki-CVS] SVN: [63076] trunk/phase3/includes/Pager.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/63076
Revision: 63076
Author: ialex
Date: 2010-02-28 15:43:51 + (Sun, 28 Feb 2010)
Log Message:
---
* Fixed some doxygen warnings
* Documented a bit
Modified Paths:
--
trunk/phase3/includes/Pager.php
Modified: trunk/phase3/includes/Pager.php
===
--- trunk/phase3/includes/Pager.php 2010-02-28 15:28:38 UTC (rev 63075)
+++ trunk/phase3/includes/Pager.php 2010-02-28 15:43:51 UTC (rev 63076)
@@ -186,6 +186,10 @@
/**
* Extract some useful data from the result object for use by
* the navigation bar, put it into $this
+*
+* @param $offset String: index offset, inclusive
+* @param $limit Integer: exact query limit
+* @param $res ResultWrapper
*/
function extractResultInfo( $offset, $limit, ResultWrapper $res ) {
$numRows = $res->numRows();
@@ -235,6 +239,8 @@
/**
* Get some text to go in brackets in the "function name" part of the
SQL comment
+*
+* @return String
*/
function getSqlComment() {
return get_class( $this );
@@ -244,9 +250,9 @@
* Do a query with specified parameters, rather than using the object
* context
*
-* @param string $offset Index offset, inclusive
-* @param integer $limit Exact query limit
-* @param boolean $descending Query direction, false for ascending,
true for descending
+* @param $offset String: index offset, inclusive
+* @param $limit Integer: exact query limit
+* @param $descending Boolean: query direction, false for ascending,
true for descending
* @return ResultWrapper
*/
function reallyDoQuery( $offset, $limit, $descending ) {
@@ -275,13 +281,15 @@
/**
* Pre-process results; useful for performing batch existence checks,
etc.
*
-* @param ResultWrapper $result Result wrapper
+* @param $result ResultWrapper
*/
protected function preprocessResults( $result ) {}
/**
* Get the formatted result list. Calls getStartBody(), formatRow() and
* getEndBody(), concatenates the results and returns them.
+*
+* @return String
*/
function getBody() {
if ( !$this->mQueryDone ) {
@@ -314,6 +322,11 @@
/**
* Make a self-link
+*
+* @param $text String: text displayed on the link
+* @param $query Array: associative array of paramter to be in the
query string
+* @param $type String: value of the "rel" attribute
+* @return String: HTML fragment
*/
function makeLink($text, $query = null, $type=null) {
if ( $query === null ) {
@@ -341,6 +354,8 @@
/**
* Hook into getBody(), allows text to be inserted at the start. This
* will be called even if there are no rows in the result set.
+*
+* @return String
*/
function getStartBody() {
return '';
@@ -348,6 +363,8 @@
/**
* Hook into getBody() for the end of the list
+*
+* @return String
*/
function getEndBody() {
return '';
@@ -356,6 +373,8 @@
/**
* Hook into getBody(), for the bit between the start and the
* end when there are no rows
+*
+* @return String
*/
function getEmptyBody() {
return '';
@@ -364,6 +383,8 @@
/**
* Title used for self-links. Override this if you want to be able to
* use a title other than $wgTitle
+*
+* @return Title object
*/
function getTitle() {
return $GLOBALS['wgTitle'];
@@ -371,6 +392,8 @@
/**
* Get the current skin. This can be overridden if necessary.
+*
+* @return Skin object
*/
function getSkin() {
if ( !isset( $this->mSkin ) ) {
@@ -384,6 +407,8 @@
* Get an array of query parameters that should be put into self-links.
* By default, all parameters passed in the URL are used, except for a
* short blacklist.
+*
+* @return Associative array
*/
function getDefaultQuery() {
if ( !isset( $this->mDefaultQuery ) ) {
@@ -401,6 +426,8 @@
/**
* Get the number of rows in the result set
+*
+* @return Integer
*/
function getNumRows() {
if ( !$this->mQueryDone ) {
@@ -411,6 +438,8 @@
/**
* Get a URL query array for the prev, next, first and last links.
+*
+* @return Array
*/
function getPagingQueries() {
if ( !$this->mQueryDone ) {
@@ -446,6 +475,11
[MediaWiki-CVS] SVN: [63075] trunk/tools/planet
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/63075 Revision: 63075 Author: shinjiman Date: 2010-02-28 15:28:38 + (Sun, 28 Feb 2010) Log Message: --- +stubs for it, per http://meta.wikimedia.org/wiki/Planet_Wikimedia/New_language Modified Paths: -- trunk/tools/planet/ar/templates/index.html.tmpl trunk/tools/planet/cs/templates/index.html.tmpl trunk/tools/planet/de/templates/index.html.tmpl trunk/tools/planet/en/templates/index.html.tmpl trunk/tools/planet/fr/templates/index.html.tmpl trunk/tools/planet/gmq/templates/index.da.html.tmpl trunk/tools/planet/gmq/templates/index.is.html.tmpl trunk/tools/planet/gmq/templates/index.nb.html.tmpl trunk/tools/planet/gmq/templates/index.nn.html.tmpl trunk/tools/planet/gmq/templates/index.sv.html.tmpl trunk/tools/planet/it/config.ini trunk/tools/planet/it/templates/index.html.tmpl trunk/tools/planet/pl/templates/index.html.tmpl trunk/tools/planet/pt/templates/index.html.tmpl trunk/tools/planet/ro/templates/index.html.tmpl trunk/tools/planet/ru/templates/index.html.tmpl trunk/tools/planet/sr/templates/index.html.tmpl trunk/tools/planet/zh/templates/index.html.tmpl Added Paths: --- trunk/tools/planet/it/ Modified: trunk/tools/planet/ar/templates/index.html.tmpl === --- trunk/tools/planet/ar/templates/index.html.tmpl 2010-02-28 15:10:56 UTC (rev 63074) +++ trunk/tools/planet/ar/templates/index.html.tmpl 2010-02-28 15:28:38 UTC (rev 63075) @@ -154,6 +154,7 @@ http://gmq.planet.wikimedia.org/index.nn.html";>Norsk (nynorsk) http://gmq.planet.wikimedia.org/index.sv.html";>Svenska +http://it.planet.wikimedia.org";>Italiano http://pl.planet.wikimedia.org";>Polski http://pt.planet.wikimedia.org";>Português http://ro.planet.wikimedia.org";>Română Modified: trunk/tools/planet/cs/templates/index.html.tmpl === --- trunk/tools/planet/cs/templates/index.html.tmpl 2010-02-28 15:10:56 UTC (rev 63074) +++ trunk/tools/planet/cs/templates/index.html.tmpl 2010-02-28 15:28:38 UTC (rev 63075) @@ -167,6 +167,7 @@ http://gmq.planet.wikimedia.org/index.nn.html"; lang="nn" hreflang="nn">Norsk (nynorsk) http://gmq.planet.wikimedia.org/index.sv.html"; lang="sv" hreflang="sv">Svenska + http://it.planet.wikimedia.org"; lang="it" hreflang="it">Italiano http://pl.planet.wikimedia.org"; lang="pl" hreflang="pl">Polski http://pt.planet.wikimedia.org"; lang="pt" hreflang="pt">Português http://ro.planet.wikimedia.org"; lang="ro" hreflang="ro">Română Modified: trunk/tools/planet/de/templates/index.html.tmpl === --- trunk/tools/planet/de/templates/index.html.tmpl 2010-02-28 15:10:56 UTC (rev 63074) +++ trunk/tools/planet/de/templates/index.html.tmpl 2010-02-28 15:28:38 UTC (rev 63075) @@ -154,6 +154,7 @@ http://gmq.planet.wikimedia.org/index.nn.html";>Norsk (nynorsk) http://gmq.planet.wikimedia.org/index.sv.html";>Svenska +http://it.planet.wikimedia.org";>Italiano http://pl.planet.wikimedia.org";>Polski http://pt.planet.wikimedia.org";>Português http://ro.planet.wikimedia.org";>Română Modified: trunk/tools/planet/en/templates/index.html.tmpl === --- trunk/tools/planet/en/templates/index.html.tmpl 2010-02-28 15:10:56 UTC (rev 63074) +++ trunk/tools/planet/en/templates/index.html.tmpl 2010-02-28 15:28:38 UTC (rev 63075) @@ -156,6 +156,7 @@ http://gmq.planet.wikimedia.org/index.nn.html";>Norsk (nynorsk) http://gmq.planet.wikimedia.org/index.sv.html";>Svenska +http://it.planet.wikimedia.org";>Italiano http://pl.planet.wikimedia.org";>Polski http://pt.planet.wikimedia.org";>Português http://ro.planet.wikimedia.org";>Română Modified: trunk/tools/planet/fr/templates/index.html.tmpl === --- trunk/tools/planet/fr/templates/index.html.tmpl 2010-02-28 15:10:56 UTC (rev 63074) +++ trunk/tools/planet/fr/templates/index.html.tmpl 2010-02-28 15:28:38 UTC (rev 63075) @@ -155,6 +155,7 @@ http://gmq.planet.wikimedia.org/index.nn.html";>Norsk (nynorsk) http://gmq.planet.wikimedia.org/index.sv.html";>Svenska +http://it.planet.wikimedia.org";>Italiano http://pl.planet.wikimedia.org";>Polski http://pt.planet.wikimedia.org";>Português http://ro.planet.wikimedia.org";>Română Modified: trunk/tools/planet/gmq/templates/index.da.html.tmpl === --- trunk/tools/planet/gmq/templates/index.da.html.tmpl 2010-02-28 15:10:56 UTC (rev 63074) +++ trunk/tools/planet/gmq/templates/index.da.html.tmpl 2010-02-28 15:28:38 UTC (rev 63075) @@ -157,6 +157,7 @@ http://gmq.planet.wikimedia.org/index.nn.html";>Norsk (nynorsk)
[MediaWiki-CVS] SVN: [63074] branches/new-installer/phase3/includes/installer/Schema.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/63074 Revision: 63074 Author: demon Date: 2010-02-28 15:10:56 + (Sun, 28 Feb 2010) Log Message: --- Typofix column name, add missing column Modified Paths: -- branches/new-installer/phase3/includes/installer/Schema.php Modified: branches/new-installer/phase3/includes/installer/Schema.php === --- branches/new-installer/phase3/includes/installer/Schema.php 2010-02-28 15:04:00 UTC (rev 63073) +++ branches/new-installer/phase3/includes/installer/Schema.php 2010-02-28 15:10:56 UTC (rev 63074) @@ -192,7 +192,7 @@ 'user_properties' => array( 'prefix' => 'up', 'fields' => array( - 'id' => array( + 'user' => array( 'type' => self::TYPE_INT, 'null' => false, ), @@ -599,6 +599,10 @@ 'null'=> false, 'default' => '', ), + 'timestamp' => array( + 'type' => self::TYPE_DATETIME, + 'null' => false, + ), ), 'indexes' => array( 'cl_from' => array( ___ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [63073] branches/new-installer/phase3/includes/installer/SchemaBuilder .php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/63073
Revision: 63073
Author: demon
Date: 2010-02-28 15:04:00 + (Sun, 28 Feb 2010)
Log Message:
---
Add missing break; and rm trailing space
Modified Paths:
--
branches/new-installer/phase3/includes/installer/SchemaBuilder.php
Modified: branches/new-installer/phase3/includes/installer/SchemaBuilder.php
===
--- branches/new-installer/phase3/includes/installer/SchemaBuilder.php
2010-02-28 15:01:17 UTC (rev 63072)
+++ branches/new-installer/phase3/includes/installer/SchemaBuilder.php
2010-02-28 15:04:00 UTC (rev 63073)
@@ -244,6 +244,7 @@
break;
case Schema::TYPE_REAL:
$def = 'real';
+ break;
default:
$this->isOk = false;
}
@@ -254,7 +255,7 @@
$def = $def . ' binary';
}
if( isset( $attribs['null'] ) ) {
- $def .= $attribs['null'] ? ' NULL ' : ' NOT
NULL';
+ $def .= $attribs['null'] ? ' NULL' : ' NOT
NULL';
}
// Use array_key_exists() since 'default' might be set to null
if( array_key_exists( 'default', $attribs ) ) {
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [63072] branches/new-installer/phase3/includes/installer/SchemaBuilder .php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/63072
Revision: 63072
Author: demon
Date: 2010-02-28 15:01:17 + (Sun, 28 Feb 2010)
Log Message:
---
Typofix
Modified Paths:
--
branches/new-installer/phase3/includes/installer/SchemaBuilder.php
Modified: branches/new-installer/phase3/includes/installer/SchemaBuilder.php
===
--- branches/new-installer/phase3/includes/installer/SchemaBuilder.php
2010-02-28 14:59:57 UTC (rev 63071)
+++ branches/new-installer/phase3/includes/installer/SchemaBuilder.php
2010-02-28 15:01:17 UTC (rev 63072)
@@ -56,7 +56,7 @@
* @return SchemaBuilder subclass
*/
public static function newFromType( $type ) {
- $class = ucfirst( strtolower( $dbType ) ) . 'Schema';
+ $class = ucfirst( strtolower( $type ) ) . 'Schema';
if ( !class_exists( $class ) ) {
throw new Exception( "No such database class $class" );
} else {
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [63071] branches/new-installer/phase3/includes/installer/SchemaBuilder .php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/63071
Revision: 63071
Author: demon
Date: 2010-02-28 14:59:57 + (Sun, 28 Feb 2010)
Log Message:
---
updateTable() should match parent declaration
Modified Paths:
--
branches/new-installer/phase3/includes/installer/SchemaBuilder.php
Modified: branches/new-installer/phase3/includes/installer/SchemaBuilder.php
===
--- branches/new-installer/phase3/includes/installer/SchemaBuilder.php
2010-02-28 14:58:12 UTC (rev 63070)
+++ branches/new-installer/phase3/includes/installer/SchemaBuilder.php
2010-02-28 14:59:57 UTC (rev 63071)
@@ -273,7 +273,7 @@
return $def . ",";
}
- protected function updateTable() {
+ protected function updateTable( $name, $definition, $db ) {
return '';
}
}
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [63070] branches/new-installer/phase3
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/63070 Revision: 63070 Author: maxsem Date: 2010-02-28 14:58:12 + (Sun, 28 Feb 2010) Log Message: --- rm old tests from new-installer Removed Paths: - branches/new-installer/phase3/Makefile branches/new-installer/phase3/t/ branches/new-installer/phase3/tests/ Deleted: branches/new-installer/phase3/Makefile === --- branches/new-installer/phase3/Makefile 2010-02-28 14:42:21 UTC (rev 63069) +++ branches/new-installer/phase3/Makefile 2010-02-28 14:58:12 UTC (rev 63070) @@ -1,23 +0,0 @@ -# -# This Makefile is used to test some MediaWiki functions. If you -# want to install MediaWiki, point your browser to ./config/ -# - -# Configuration: -PROVE_BIN="prove" - -# Describe our tests: -BASE_TEST=$(wildcard t/*.t) -INCLUDES_TESTS=$(wildcard t/inc/*t) - -# Build groups: -ALL_TESTS=$(BASE_TEST) $(INCLUDES_TESTS) - -test: t/Test.php - $(PROVE_BIN) $(ALL_TESTS) - -fast: t/Test.php - $(PROVE_BIN) $(ALL_TESTS) - -verbose: t/Test.php - $(PROVE_BIN) -v $(ALL_TESTS) | egrep -v '^ok' ___ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [63069] branches/new-installer/phase3/languages/messages/MessagesEn. php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/63069 Revision: 63069 Author: siebrand Date: 2010-02-28 14:42:21 + (Sun, 28 Feb 2010) Log Message: --- DB -> [Dd]atabase Modified Paths: -- branches/new-installer/phase3/languages/messages/MessagesEn.php Modified: branches/new-installer/phase3/languages/messages/MessagesEn.php === --- branches/new-installer/phase3/languages/messages/MessagesEn.php 2010-02-28 14:36:55 UTC (rev 63068) +++ branches/new-installer/phase3/languages/messages/MessagesEn.php 2010-02-28 14:42:21 UTC (rev 63069) @@ -4097,7 +4097,7 @@ 'config-page-welcome' => 'Welcome', 'config-page-dbconnect' => 'Connect to DB', 'config-page-upgrade' => 'Upgrade existing', -'config-page-dbsettings' => 'DB settings', +'config-page-dbsettings' => 'Database settings', 'config-page-name' => 'Name', 'config-page-options' => 'Options', 'config-page-install' => 'Install', @@ -4188,30 +4188,30 @@ 'config-no-uri' => 'Error: Could not determine the current URI. Installation aborted.', 'config-extension' => 'Installing MediaWiki with $1 file extensions', -'config-db-type' => 'DB type:', -'config-db-host' => 'DB host:', +'config-db-type' => 'Database type:', +'config-db-host' => 'Database host:', 'config-db-host-help' => 'If your database server isn\'t on your web server, enter the name or IP address here. If you are using a shared web host, your hosting provider should give you the correct host name in their documentation.', 'config-db-wiki-settings' => 'Identify this wiki', -'config-db-name' => 'DB name:', +'config-db-name' => 'Database name:', 'config-db-name-help' => 'Choose a name that identifies your wiki. It should not contain spaces or hyphens. If you are using a shared host, your hosting provider will either give you a specific database name to use, or let you create databases via a control panel.', 'config-db-install-account' => 'User account for installation', -'config-db-username' => 'DB username:', -'config-db-password' => 'DB password:', +'config-db-username' => 'Database username:', +'config-db-password' => 'Database password:', 'config-db-install-help' => 'Select the username and password that will be used to connect to the database during the installation process.', 'config-db-account-lock' => 'Use the same username and password during normal operation', 'config-db-wiki-account' => 'User account for normal operation', 'config-db-wiki-help' => 'Select the username and password that will be used to connect to the database during normal wiki operation. If the account does not exist, and the installation account has sufficient privileges, this user account will be created with the minimum privileges required to operate the wiki.', -'config-db-prefix' => 'DB table prefix:', +'config-db-prefix' => 'Database table prefix:', 'config-db-prefix-help' => 'If you need to share one database between multiple wikis, or between MediaWiki and another web application, you may choose to add a prefix to all the table names to avoid conflicts. Do not use spaces or hyphens. This may normally be left blank.', -'config-db-charset' => 'DB character set', +'config-db-charset' => 'Database character set', 'config-charset-mysql5-binary' => 'MySQL 4.1/5.0 binary', 'config-charset-mysql5' => 'MySQL 4.1/5.0 UTF-8', 'config-charset-mysql4' => 'MySQL 4.0 backwards-compatible UTF-8', @@ -4219,7 +4219,7 @@ In binary mode, MediaWiki stores UTF-8 text to the database in binary fields. This is more efficient than MySQL\'s UTF-8 mode, and allows you to use the full range of Unicode characters. In UTF-8 mode, MySQL will know what character set your data is in, and can present and convert it appropriately, but it won\'t let you store characters above the [http://en.wikipedia.org/wiki/Mapping_of_Unicode_character_planes Basic Multilingual Plane].', 'config-mysql-old' => 'MySQL $1 or later is required, you have $2.', -'config-db-port' => 'DB port:', +'config-db-port' => 'Database port:', 'config-db-schema' => 'Schema for MediaWiki', 'config-db-ts2-schema' => 'Schema for tsearch2', 'config-db-schema-help' => 'The above schemas are generally correct, only change them if you are sure you need to.', @@ -4236,10 +4236,10 @@ 'config-header-mysql' => 'MySQL settings', 'config-header-postgres' => 'PostgreSQL settings', 'config-header-sqlite' => 'SQLite settings', -'config-invalid-db-type' => 'Invalid DB type', -'config-missing-db-name' => 'You must enter a value for "DB name"', -'config-invalid-db-name' => 'Invalid DB name "$1". It may only contain numbers, letters and underscores.', -'config-invalid-db-prefix' => 'Invalid DB prefix "$1". It may only contain numbers, letters and underscores.', +'config-invalid-db-type' => 'Invalid database type', +'config-missing-db-name' => 'You must enter a value for "Database name"', +'config-invalid-db-name' => 'Invalid database na
[MediaWiki-CVS] SVN: [63068] branches/new-installer/phase3/languages/messages/MessagesEn. php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/63068 Revision: 63068 Author: siebrand Date: 2010-02-28 14:36:55 + (Sun, 28 Feb 2010) Log Message: --- Newline and trailing space tweaks Modified Paths: -- branches/new-installer/phase3/languages/messages/MessagesEn.php Modified: branches/new-installer/phase3/languages/messages/MessagesEn.php === --- branches/new-installer/phase3/languages/messages/MessagesEn.php 2010-02-28 12:33:01 UTC (rev 63067) +++ branches/new-installer/phase3/languages/messages/MessagesEn.php 2010-02-28 14:36:55 UTC (rev 63068) @@ -4113,8 +4113,7 @@ === Technical data === Below is some technical data that you can provide to us if you need help during installation.', -'config-copyright' => " -=== Copyright and Terms === +'config-copyright' => "=== Copyright and Terms === MediaWiki is Copyright © 2001-2008 by Magnus Manske, Brion Vibber, Lee Daniel Crocker, Tim Starling, Erik Möller, Gabriel Wicke, Ævar Arnfjörð Bjarmason, Niklas Laxström, Domas Mituzas, Rob Church, Yuri Astrakhan, Aryeh Gregor, Aaron Schulz and others. @@ -4122,16 +4121,13 @@ 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. or [http://www.gnu.org/copyleft/gpl.html read it online]. -", -'config-sidebar' => " -* [http://www.mediawiki.org MediaWiki home] +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. or [http://www.gnu.org/copyleft/gpl.html read it online].", +'config-sidebar' => "* [http://www.mediawiki.org MediaWiki home] * Readme * Release notes * [http://www.mediawiki.org/wiki/Help:Contents User's Guide] * [http://www.mediawiki.org/wiki/Manual:Contents Administrator's Guide] -* [http://www.mediawiki.org/wiki/Manual:FAQ FAQ] -", +* [http://www.mediawiki.org/wiki/Manual:FAQ FAQ]", 'config-env-latest-ok' => 'You are installing the latest version of Mediawiki', 'config-env-latest-new' => "'''Note:''' You are installing a development version of Mediawiki", 'config-env-latest-old' => "'''Warning''': You are installing an outdated version of Mediawiki", @@ -4221,8 +4217,7 @@ 'config-charset-mysql4' => 'MySQL 4.0 backwards-compatible UTF-8', 'config-charset-help' => 'WARNING: If you use backwards-compatible UTF-8 on MySQL 4.1+, and subsequently back up the database with mysqldump, it may destroy all non-ASCII characters, irreversibly corrupting your backups!. -In binary mode, MediaWiki stores UTF-8 text to the database in binary fields. This is more efficient than MySQL\'s UTF-8 mode, and allows you to use the full range of Unicode characters. In UTF-8 mode, MySQL will know what character set your data is in, and can present and convert it appropriately, but it won\'t let you store characters above the [http://en.wikipedia.org/wiki/Mapping_of_Unicode_character_planes Basic Multilingual Plane]. -', +In binary mode, MediaWiki stores UTF-8 text to the database in binary fields. This is more efficient than MySQL\'s UTF-8 mode, and allows you to use the full range of Unicode characters. In UTF-8 mode, MySQL will know what character set your data is in, and can present and convert it appropriately, but it won\'t let you store characters above the [http://en.wikipedia.org/wiki/Mapping_of_Unicode_character_planes Basic Multilingual Plane].', 'config-mysql-old' => 'MySQL $1 or later is required, you have $2.', 'config-db-port' => 'DB port:', 'config-db-schema' => 'Schema for MediaWiki', @@ -4265,15 +4260,13 @@ You can now [$1 start using your wiki]. If you want to regenerate your LocalSettings.php file, click the button below. -This is not recommended unless you are having problems with your wiki. -', +This is not recommended unless you are having problems with your wiki.', 'config-regenerate' => 'Regenerate LocalSettings.php >', 'config-show-table-status' => 'SHOW TABLE STATUS query failed!', 'config-unknown-collation' => 'Warning: Unrecognised existing collation', 'config-db-web-account' => 'DB account for web access', -'config-db-web-help' => 'Select the username and password that the web server will use to connect to the database server, during ordinary operation of the wiki. -', +'config-db-web-help' => 'Select the username and password that the web server will use to connect to the database server, during ordinary operation of the wiki.', 'config-db-web-account-same' => 'Use the same account as for in
[MediaWiki-CVS] SVN: [63067] branches/REL1_16/phase3/RELEASE-NOTES
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/63067 Revision: 63067 Author: demon Date: 2010-02-28 12:33:01 + (Sun, 28 Feb 2010) Log Message: --- Backport r63066 (remove $wgVariant from HISTORY) Modified Paths: -- branches/REL1_16/phase3/RELEASE-NOTES Modified: branches/REL1_16/phase3/RELEASE-NOTES === --- branches/REL1_16/phase3/RELEASE-NOTES 2010-02-28 12:32:33 UTC (rev 63066) +++ branches/REL1_16/phase3/RELEASE-NOTES 2010-02-28 12:33:01 UTC (rev 63067) @@ -35,8 +35,6 @@ * Subpages are now enabled in the MediaWiki namespace by default. This is mainly a cosmetic change, and does not in any way affect the MessageCache, which was already effectively treating the namespace as if it had subpages. -* (bug 10837) $wgVariant is a user variant selected in the user's preferences - if the $wgContLang does not have variant, then the $wgLang is used instead. * Oracle: maintenance/ora/user.sql script for creating DB user on oracle with appropriate privileges. Creating this user with web-install page requires oci8.privileged_connect set to On in php.ini. ___ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [63066] trunk/phase3/HISTORY
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/63066 Revision: 63066 Author: demon Date: 2010-02-28 12:32:33 + (Sun, 28 Feb 2010) Log Message: --- Remove $wgVariant from HISTORY, Tim removed it in r55746. Will backport to 1.16 RELEASE-NOTES Modified Paths: -- trunk/phase3/HISTORY Modified: trunk/phase3/HISTORY === --- trunk/phase3/HISTORY2010-02-28 11:32:40 UTC (rev 63065) +++ trunk/phase3/HISTORY2010-02-28 12:32:33 UTC (rev 63066) @@ -19,8 +19,6 @@ * Subpages are now enabled in the MediaWiki namespace by default. This is mainly a cosmetic change, and does not in any way affect the MessageCache, which was already effectively treating the namespace as if it had subpages. -* (bug 10837) $wgVariant is a user variant selected in the user's preferences - if the $wgContLang does not have variant, then the $wgLang is used instead. * Oracle: maintenance/ora/user.sql script for creating DB user on oracle with appropriate privileges. Creating this user with web-install page requires oci8.privileged_connect set to On in php.ini. ___ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [63065] trunk/extensions/Storyboard
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/63065
Revision: 63065
Author: catrope
Date: 2010-02-28 11:32:40 + (Sun, 28 Feb 2010)
Log Message:
---
Storyboard: svn:eol-style native on jquery.ajaxscroll.js, add Makefile to
generate minified JS
Modified Paths:
--
trunk/extensions/Storyboard/tags/Storyboard/jquery.ajaxscroll.js
trunk/extensions/Storyboard/tags/Storyboard/jquery.ajaxscroll.min.js
Added Paths:
---
trunk/extensions/Storyboard/Makefile
Property Changed:
trunk/extensions/Storyboard/tags/Storyboard/jquery.ajaxscroll.js
Added: trunk/extensions/Storyboard/Makefile
===
--- trunk/extensions/Storyboard/Makefile(rev 0)
+++ trunk/extensions/Storyboard/Makefile2010-02-28 11:32:40 UTC (rev
63065)
@@ -0,0 +1,26 @@
+#
+# Handy makefile to combine and minify css and javascript files
+#
+
+all: tags/Storyboard/jquery.ajaxscroll.min.js
+
+# JavaScript Minification
+
+tags/Storyboard/jquery.ajaxscroll.min.js: tags/Storyboard/jquery.ajaxscroll.js
jsmin
+ if [ -e ./jsmin ]; then ./jsmin < tags/Storyboard/jquery.ajaxscroll.js
> tags/Storyboard/jquery.ajaxscroll.min.js;\
+ else jsmin < tags/Storyboard/jquery.ajaxscroll.js >
tags/Storyboard/jquery.ajaxscroll.min.js; fi
+
+# JSMin - For more info on JSMin, see:
http://www.crockford.com/javascript/jsmin.html
+
+jsmin:
+ type -P jsmin &>/dev/null || ( wget
http://www.crockford.com/javascript/jsmin.c; gcc jsmin.c -o jsmin )
+
+# Actions
+
+distclean: clean
+ rm -rf jsmin
+ rm -rf jsmin.c
+
+clean:
+ rm -f tags/Storyboard/jquery.ajaxscroll.min.js
+
Property changes on: trunk/extensions/Storyboard/Makefile
___
Added: svn:eol-style
+ native
Modified: trunk/extensions/Storyboard/tags/Storyboard/jquery.ajaxscroll.js
===
--- trunk/extensions/Storyboard/tags/Storyboard/jquery.ajaxscroll.js
2010-02-28 10:32:31 UTC (rev 63064)
+++ trunk/extensions/Storyboard/tags/Storyboard/jquery.ajaxscroll.js
2010-02-28 11:32:40 UTC (rev 63065)
@@ -1,158 +1,158 @@
-/**
- * AjaxScroll v0.1 (jQuery Plugins)
- *
- * @author Timmy Tin (ycTIN)
- * @license GPL
- * @version 0.1
- * @copyright Timmy Tin (ycTIN)
- * @website http://project.yctin.com/ajaxscroll
- *
- */
-(function($) {
- $.fn.ajaxScroll=function(opt){
- opt=jQuery.extend(
- {
- batchNum:5,
- batchSize:30,
- horizontal:false,
- batchTemplate:null,
- boxTemplate:null,
- batchClass:"batch",
- boxClass:"box",
- emptyBatchClass:"empty",
- scrollPaneClass:"scrollpane",
- lBound:"auto",
- uBound:"auto",
- eBound:"auto",
- maxOffset:1000,
- scrollDelay:600,
- endDelay:100,
- updateBatch:null,
- updateEnd:null
- },
- opt
- );
- return this.each(function(){
- var ele=this;
- var $me=jQuery(this);
- var $sp;
- var fnEnd,fnScroll;
- var offset=0;
- var lsp=-1;_css();
- opt.boxTemplate=(opt.boxTemplate||" ");
- if(opt.horizontal){
-
opt.batchTemplate=(opt.batchTemplate||"");
-
$sp=jQuery("").addClass(opt.scrollPaneClass);
- $me.append($sp);
- offset=batch($sp.find("tr"),offset,opt);
- _bz();
- _ab();
- fnEnd=hEnd;
- fnScroll=hScroll;
- }else{
-
opt.batchTemplate=(opt.batchTemplate||"");
-
$sp=jQuery("").addClass(opt.scrollPaneClass);
- $me.append($sp);
- offset=batch($sp,offset,opt);
- _bz();
- _ab();
- fnEnd=vEnd;
- fnScroll=vScroll;
- }
- setTimeout(monEnd,opt.endDelay);
- if(typeof opt.updateBatch=='function'){
-
[MediaWiki-CVS] SVN: [63064] trunk/extensions/WikimediaMessages/WikimediaLicenseTexts.i18n. php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/63064
Revision: 63064
Author: multichill
Date: 2010-02-28 10:32:31 + (Sun, 28 Feb 2010)
Log Message:
---
wm-license-gfdl-fsf-link -> wm-license-fsf-wiki-link
(going to be used for GPL and LGPL too)
Modified Paths:
--
trunk/extensions/WikimediaMessages/WikimediaLicenseTexts.i18n.php
Modified: trunk/extensions/WikimediaMessages/WikimediaLicenseTexts.i18n.php
===
--- trunk/extensions/WikimediaMessages/WikimediaLicenseTexts.i18n.php
2010-02-28 01:02:01 UTC (rev 63063)
+++ trunk/extensions/WikimediaMessages/WikimediaLicenseTexts.i18n.php
2010-02-28 10:32:31 UTC (rev 63064)
@@ -180,6 +180,7 @@
'wm-license-cc-conditions-attribution-text' => 'You must attribute the
work in the manner specified by the author or licensor (but not in any way that
suggests that they endorse you or your use of the work).',
'wm-license-cc-conditions-share_alike-header' => 'share alike',
'wm-license-cc-conditions-share_alike-text' => 'If you alter,
transform, or build upon this work, you may distribute the resulting work only
under the same or similar license to this one.',
+ 'wm-license-fsf-wiki-link' => 'w:en:Free Software Foundation',
'wm-license-gfdl-1.2-and-later' => 'Permission is granted to copy,
distribute and/or modify this document under the terms of the
\'\'\'[[{{int:wm-license-gfdl-wiki-link}}|GNU Free Documentation
License]]\'\'\', Version 1.2 or any later version published by the
[[{{int:wm-license-gfdl-fsf-link}}|Free Software Foundation]]; with no
Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. A copy of
the license is included in the section entitled
\'\'[[{{int:wm-license-gfdl-full-1.2-link}}|GNU Free Documentation
License]]\'\'.',
'wm-license-gfdl-1.2-only' => 'Permission is granted to copy,
distribute and/or modify this document under the terms of the
\'\'\'[[{{int:wm-license-gfdl-wiki-link}}|GNU Free Documentation
License]]\'\'\', Version 1.2 only as published by the
[[{{int:wm-license-gfdl-fsf-link}}|Free Software Foundation]]; with no
Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. A copy of
the license is included in the section entitled
\'\'[[{{int:wm-license-gfdl-full-1.2-link}}|GNU Free Documentation
License]]\'\'.',
'wm-license-gfdl-1.3-and-later' => 'Permission is granted to copy,
distribute and/or modify this document under the terms of the
\'\'\'[[{{int:wm-license-gfdl-wiki-link}}|GNU Free Documentation
License]]\'\'\', Version 1.3 or any later version published by the
[[{{int:wm-license-gfdl-fsf-link}}|Free Software Foundation]]; with no
Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. A copy of
the license is included in the section entitled
\'\'[[{{int:wm-license-gfdl-full-1.3-link}}|GNU Free Documentation
License]]\'\'.',
@@ -187,7 +188,6 @@
'wm-license-gfdl-wiki-link' => 'w:en:GNU Free Documentation License',
'wm-license-gfdl-full-1.2-link' => 'Commons:GNU Free Documentation
License 1.2',
'wm-license-gfdl-full-1.3-link' => 'Commons:GNU Free Documentation
License 1.3',
- 'wm-license-gfdl-fsf-link' => 'w:en:Free Software Foundation',
'wm-license-information-table-summary' => 'A standardized table
providing complete information about the file, including description of what it
shows and how it was made, copyright status and source.',
'wm-license-information-description' => 'Description',
'wm-license-information-source' => 'Source',
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
