http://www.mediawiki.org/wiki/Special:Code/MediaWiki/97414
Revision: 97414
Author: catrope
Date: 2011-09-18 11:36:43 +0000 (Sun, 18 Sep 2011)
Log Message:
-----------
1.18: MFT r96775, r97362, r97365, r97381
Modified Paths:
--------------
branches/REL1_18/phase3/RELEASE-NOTES-1.18
branches/REL1_18/phase3/docs/hooks.txt
branches/REL1_18/phase3/includes/User.php
branches/REL1_18/phase3/resources/Resources.php
branches/REL1_18/phase3/resources/mediawiki/mediawiki.js
branches/REL1_18/phase3/skins/common/commonPrint.css
branches/REL1_18/phase3/skins/common/shared.css
Property Changed:
----------------
branches/REL1_18/phase3/RELEASE-NOTES-1.18
branches/REL1_18/phase3/docs/hooks.txt
Modified: branches/REL1_18/phase3/RELEASE-NOTES-1.18
===================================================================
--- branches/REL1_18/phase3/RELEASE-NOTES-1.18 2011-09-18 11:21:41 UTC (rev
97413)
+++ branches/REL1_18/phase3/RELEASE-NOTES-1.18 2011-09-18 11:36:43 UTC (rev
97414)
@@ -203,6 +203,13 @@
Vary: X-Forwarded-Proto headers.
* New maintenance script to refresh image metadata
(maintenance/refreshImageMetadata.php)
* (bug 16428) Include permalink in printable version
+* (bug 30940) Add a hook in User:getDefaultOptions.
+ To give extensions a better and more flexible way of providing default
+ values for preferences a hook has been introdiced in
User:getDefaultOptions().
+ Setting preferences in $wgDefaultUserOptions still work fine, but when
reading
+ them (i.e. with array_keys) to get a list of all preferences, then
+ $wgDefaultUserOptions should no longer be used as it will contain those set
via
+ User:getDefaultOptions().
=== Bug fixes in 1.18 ===
* mw.util.getScript has been implemented (like wfScript in GlobalFunctions.php)
Property changes on: branches/REL1_18/phase3/RELEASE-NOTES-1.18
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/RELEASE-NOTES-1.18:51646
/branches/REL1_17/phase3/RELEASE-NOTES-1.18:81445,81448
/branches/new-installer/phase3/RELEASE-NOTES-1.18:43664-66004
/branches/sqlite/RELEASE-NOTES-1.18:58211-58321
/trunk/phase3/RELEASE-NOTES-1.18:92580,92634,92713,92762,92765,92791,92854,92884,92886-92887,92894,92898,92907,92932,92958,93141,93149,93151,93233-93234,93258,93266,93303,93382-93383,93516-93518,93520,93818-93822,93847,93858,93891,93916,93935-93936,94058,94062,94068,94107,94155,94235-94236,94277,94346,94372,94422,94425,94444,94448,94456,94498,94517,94601,94630,94728,94738,94825,94862,94995-94997,95014,95016-95017,95023,95042,95072-95073,95155,95171,95327,95332,95409-95410,95422,95426,95436,95442,95458,95467-95468,95470,95475,95493,95521,95525,95540,95562,95570,95597,95601,95608,95627,95647-95648,95651-95653,95655-95656,95659,95663,95674,95790,95812,95855,95899,95999,96087,96180,96227-96228,96286,96297,96386,96393,96405,96427,96460,96472,96509,96522,96606,96643,96645,96655,96659,96687,96762,96764,96825,96829,96833,96964,96998,97141,97143,97177,97296,97298
/trunk/phase3/RELEASE-NOTES-1.19:95655,95999
+ /branches/REL1_15/phase3/RELEASE-NOTES-1.18:51646
/branches/REL1_17/phase3/RELEASE-NOTES-1.18:81445,81448
/branches/new-installer/phase3/RELEASE-NOTES-1.18:43664-66004
/branches/sqlite/RELEASE-NOTES-1.18:58211-58321
/trunk/phase3/RELEASE-NOTES-1.18:92580,92634,92713,92762,92765,92791,92854,92884,92886-92887,92894,92898,92907,92932,92958,93141,93149,93151,93233-93234,93258,93266,93303,93382-93383,93516-93518,93520,93818-93822,93847,93858,93891,93916,93935-93936,94058,94062,94068,94107,94155,94235-94236,94277,94346,94372,94422,94425,94444,94448,94456,94498,94517,94601,94630,94728,94738,94825,94862,94995-94997,95014,95016-95017,95023,95042,95072-95073,95155,95171,95327,95332,95409-95410,95422,95426,95436,95442,95458,95467-95468,95470,95475,95493,95521,95525,95540,95562,95570,95597,95601,95608,95627,95647-95648,95651-95653,95655-95656,95659,95663,95674,95790,95812,95855,95899,95999,96087,96180,96227-96228,96286,96297,96386,96393,96405,96427,96460,96472,96509,96522,96606,96643,96645,96655,96659,96687,96762,96764,96775,96825,96829,96833,96964,96998,97141,97143,97177,97296,97298,97362,97365,97381
/trunk/phase3/RELEASE-NOTES-1.19:95655,95999
Modified: branches/REL1_18/phase3/docs/hooks.txt
===================================================================
--- branches/REL1_18/phase3/docs/hooks.txt 2011-09-18 11:21:41 UTC (rev
97413)
+++ branches/REL1_18/phase3/docs/hooks.txt 2011-09-18 11:36:43 UTC (rev
97414)
@@ -1905,6 +1905,10 @@
'UserGetAllRights': after calculating a list of all available rights
&$rights: Array of rights, which may be added to.
+'UserGetDefaultOptions': after fetching the core default, this hook is ran
+right before returning the options to the caller.
+&$defaultOptions: Array of preference keys and their default values.
+
'UserGetEmail': called when getting an user email address
$user: User object
&$email: email, change this to override local email
Property changes on: branches/REL1_18/phase3/docs/hooks.txt
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/docs/hooks.txt:51646
/branches/REL1_17/phase3/docs/hooks.txt:81445,81448
/branches/new-installer/phase3/docs/hooks.txt:43664-66004
/branches/sqlite/docs/hooks.txt:58211-58321
/trunk/phase3/docs/hooks.txt:92580,92634,92713,92762,92765,92791,92854,92884,92886-92887,92894,92898,92907,92932,92958,93141,93149,93151,93233-93234,93258,93266,93303,93516-93518,93520,93818-93822,93847,93858,93891,93916,93935-93936,94058,94062,94068,94107,94155,94235,94346,94372,94422,94425,94444,94448,94456,94498,94601,94630,94728,94825,94862,94995-94997,95042,95155,95332,95410,95442,95468,95601,95812,96163,96174,96212,96217-96218,96271,96273,96306,96342,96358
+ /branches/REL1_15/phase3/docs/hooks.txt:51646
/branches/REL1_17/phase3/docs/hooks.txt:81445,81448
/branches/new-installer/phase3/docs/hooks.txt:43664-66004
/branches/sqlite/docs/hooks.txt:58211-58321
/trunk/phase3/docs/hooks.txt:92580,92634,92713,92762,92765,92791,92854,92884,92886-92887,92894,92898,92907,92932,92958,93141,93149,93151,93233-93234,93258,93266,93303,93516-93518,93520,93818-93822,93847,93858,93891,93916,93935-93936,94058,94062,94068,94107,94155,94235,94346,94372,94422,94425,94444,94448,94456,94498,94601,94630,94728,94825,94862,94995-94997,95042,95155,95332,95410,95442,95468,95601,95812,96163,96174,96212,96217-96218,96271,96273,96306,96342,96358,96775,97362,97365,97381,97405-97407
Modified: branches/REL1_18/phase3/includes/User.php
===================================================================
--- branches/REL1_18/phase3/includes/User.php 2011-09-18 11:21:41 UTC (rev
97413)
+++ branches/REL1_18/phase3/includes/User.php 2011-09-18 11:36:43 UTC (rev
97414)
@@ -1208,6 +1208,8 @@
}
$defOpt['skin'] = $wgDefaultSkin;
+ wfRunHooks( 'UserGetDefaultOptions', array( &$defOpt ) );
+
return $defOpt;
}
Modified: branches/REL1_18/phase3/resources/Resources.php
===================================================================
--- branches/REL1_18/phase3/resources/Resources.php 2011-09-18 11:21:41 UTC
(rev 97413)
+++ branches/REL1_18/phase3/resources/Resources.php 2011-09-18 11:36:43 UTC
(rev 97414)
@@ -39,8 +39,10 @@
'localBasePath' => $GLOBALS['wgStyleDirectory'],
),
'skins.modern' => array(
- 'styles' => array( 'modern/main.css' => array( 'media' =>
'screen' ),
- 'modern/print.css' => array( 'media' => 'print'
) ),
+ 'styles' => array(
+ 'modern/main.css' => array( 'media' => 'screen' ),
+ 'modern/print.css' => array( 'media' => 'print' ),
+ ),
'remoteBasePath' => $GLOBALS['wgStylePath'],
'localBasePath' => $GLOBALS['wgStyleDirectory'],
),
Modified: branches/REL1_18/phase3/resources/mediawiki/mediawiki.js
===================================================================
--- branches/REL1_18/phase3/resources/mediawiki/mediawiki.js 2011-09-18
11:21:41 UTC (rev 97413)
+++ branches/REL1_18/phase3/resources/mediawiki/mediawiki.js 2011-09-18
11:36:43 UTC (rev 97414)
@@ -500,6 +500,7 @@
for ( var i = 0; i <
style.length; i++ ) {
getMarker().before(
mw.html.element( 'link', {
'type':
'text/css',
+ 'media': media,
'rel':
'stylesheet',
'href': style[i]
} ) );
Modified: branches/REL1_18/phase3/skins/common/commonPrint.css
===================================================================
--- branches/REL1_18/phase3/skins/common/commonPrint.css 2011-09-18
11:21:41 UTC (rev 97413)
+++ branches/REL1_18/phase3/skins/common/commonPrint.css 2011-09-18
11:36:43 UTC (rev 97414)
@@ -346,3 +346,31 @@
widows: 3;
orphans: 3;
}
+
+/**
+ * Categories
+ */
+.catlinks ul {
+ display: inline;
+ margin: 0px;
+ list-style: none;
+ list-style-type: none;
+ list-style-image: none;
+ vertical-align: middle !ie;
+}
+
+.catlinks li {
+ display: inline-block;
+ line-height: 1.15em;
+ padding: 0 .4em;
+ border-left: 1px solid #AAA;
+ margin: 0.1em 0;
+ zoom: 1;
+ display: inline !ie;
+}
+
+.catlinks li:first-child {
+ padding-left: .2em;
+ border-left: none;
+}
+
Modified: branches/REL1_18/phase3/skins/common/shared.css
===================================================================
--- branches/REL1_18/phase3/skins/common/shared.css 2011-09-18 11:21:41 UTC
(rev 97413)
+++ branches/REL1_18/phase3/skins/common/shared.css 2011-09-18 11:36:43 UTC
(rev 97414)
@@ -179,9 +179,10 @@
#catlinks ul {
display:inline;
margin: 0px;
- list-style:none;
- list-style-type:none;
- list-style-image:none;
+ padding: 0px;
+ list-style: none;
+ list-style-type: none;
+ list-style-image: none;
vertical-align: middle !ie;
}
@@ -847,4 +848,4 @@
}
/* bug 12205 */
-#mw-credits a { unicode-bidi: embed; }
\ No newline at end of file
+#mw-credits a { unicode-bidi: embed; }
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
