http://www.mediawiki.org/wiki/Special:Code/MediaWiki/95127
Revision: 95127
Author: maxsem
Date: 2011-08-21 10:25:25 +0000 (Sun, 21 Aug 2011)
Log Message:
-----------
Follow-up r95112, r95124 and friends:
* Cleaned up per CR comments
* Introduced a define for extension's version, added it to credits
* Changed date format in generated file
Modified Paths:
--------------
trunk/extensions/wikihiero/SpecialHieroglyphs.php
trunk/extensions/wikihiero/generateTables.php
trunk/extensions/wikihiero/modules/ext.wikihiero.Special.js
trunk/extensions/wikihiero/wh_list.php
trunk/extensions/wikihiero/wikihiero.body.php
trunk/extensions/wikihiero/wikihiero.php
Modified: trunk/extensions/wikihiero/SpecialHieroglyphs.php
===================================================================
--- trunk/extensions/wikihiero/SpecialHieroglyphs.php 2011-08-21 10:05:07 UTC
(rev 95126)
+++ trunk/extensions/wikihiero/SpecialHieroglyphs.php 2011-08-21 10:25:25 UTC
(rev 95127)
@@ -47,7 +47,7 @@
Html::openElement( 'form',
array(
'method' => 'get',
- 'action' => SpecialPage::getTitleFor(
'Hieroglyphs' )->getLinkUrl(),
+ 'action' =>
$this->getTitle()->getLinkUrl(),
)
)
. Html::element( 'textarea', array( 'id' =>
'hiero-text', 'name' => 'text' ), $text )
Modified: trunk/extensions/wikihiero/generateTables.php
===================================================================
--- trunk/extensions/wikihiero/generateTables.php 2011-08-21 10:05:07 UTC
(rev 95126)
+++ trunk/extensions/wikihiero/generateTables.php 2011-08-21 10:25:25 UTC
(rev 95127)
@@ -70,8 +70,8 @@
$file = fopen( 'wh_list.php', 'w+' );
fwrite( $file, "<?php\n\n" );
- fwrite( $file, '// File created by generateTables.php version '
. WikiHiero::VERSION . "\n" );
- fwrite( $file, '// ' . date( 'Y/m/d \a\t H:i' ) . "\n\n" );
+ fwrite( $file, '// File created by generateTables.php version '
. WIKIHIERO_VERSION . "\n" );
+ fwrite( $file, '// ' . date( 'Y-m-d \a\t H:i' ) . "\n\n" );
fwrite( $file,
"$wh_prefabs\n\n$wh_files\n\n{$this->moreTables}\n" );
fclose( $file );
}
Modified: trunk/extensions/wikihiero/modules/ext.wikihiero.Special.js
===================================================================
--- trunk/extensions/wikihiero/modules/ext.wikihiero.Special.js 2011-08-21
10:05:07 UTC (rev 95126)
+++ trunk/extensions/wikihiero/modules/ext.wikihiero.Special.js 2011-08-21
10:25:25 UTC (rev 95127)
@@ -23,7 +23,7 @@
'text': '<hiero>' + text + '</hiero>',
'disablepp': ''
};
- $.getJSON( mw.config.get( 'wgServer' ) + mw.config.get( 'wgScriptPath'
) + '/api' + mw.config.get( 'wgScriptExtension' ),
+ $.getJSON( mw.config.get( 'wgScriptPath' ) + '/api' + mw.config.get(
'wgScriptExtension' ),
data,
function( data ) {
var html = '<table class="wikitable">'
Modified: trunk/extensions/wikihiero/wh_list.php
===================================================================
--- trunk/extensions/wikihiero/wh_list.php 2011-08-21 10:05:07 UTC (rev
95126)
+++ trunk/extensions/wikihiero/wh_list.php 2011-08-21 10:25:25 UTC (rev
95127)
@@ -1,7 +1,7 @@
<?php
-// File created by generateTables.php version 0.3.0alpha
-// 2011/08/20 at 09:31
+// File created by generateTables.php version 1.0alpha
+// 2011-08-21 at 12:00
$wh_prefabs = array(
"a&A1",
Modified: trunk/extensions/wikihiero/wikihiero.body.php
===================================================================
--- trunk/extensions/wikihiero/wikihiero.body.php 2011-08-21 10:05:07 UTC
(rev 95126)
+++ trunk/extensions/wikihiero/wikihiero.body.php 2011-08-21 10:25:25 UTC
(rev 95127)
@@ -61,7 +61,6 @@
define( "WH_DEBUG_MODE", false );
class WikiHiero {
- const VERSION = '0.3.0alpha';
const IMG_EXT = 'png';
private $scale = 100;
Modified: trunk/extensions/wikihiero/wikihiero.php
===================================================================
--- trunk/extensions/wikihiero/wikihiero.php 2011-08-21 10:05:07 UTC (rev
95126)
+++ trunk/extensions/wikihiero/wikihiero.php 2011-08-21 10:25:25 UTC (rev
95127)
@@ -1,29 +1,28 @@
<?php
-//////////////////////////////////////////////////////////////////////////
-//
-// WikiHiero - A PHP convert from text using "Manual for the encoding of
-// hieroglyphic texts for computer input" syntax to HTML entities (table and
-// images).
-//
-// Copyright (C) 2004 Guillaume Blanchard (Aoineko)
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-//
-//////////////////////////////////////////////////////////////////////////
+/**
+ * WikiHiero - adds Ancient Egyptian hieroglyphs support to MediaWiki
+ *
+ * Copyright (C) 2004 Guillaume Blanchard (Aoineko)
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ */
+define( 'WIKIHIERO_VERSION', '1.0alpha' );
+
$wgHooks['ParserFirstCallInit'][] = 'wfRegisterWikiHiero';
$wgHooks['BeforePageDisplay'][] = 'wfHieroBeforePageDisplay';
@@ -31,6 +30,7 @@
$wgExtensionCredits['parserhook'][] = array(
'path' => __FILE__,
'name' => 'WikiHiero',
+ 'version' => WIKIHIERO_VERSION,
'author' => array( 'Guillaume Blanchard', 'Max Semenik' ),
'url' => 'http://www.mediawiki.org/wiki/Extension:WikiHiero',
'descriptionmsg' => 'wikihiero-desc',
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
