WP Merge

git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@447 7be80a69-a1ef-0310-a953-fb0f7c49ff36

12 files changed, 680 insertions, 109 deletions

diff --git a/htaccess.dist b/htaccess.dist
index 1a4f621..2d84a4c 100644
--- a/htaccess.dist
+++ b/htaccess.dist
@@ -9,8 +9,8 @@ RewriteRule ^(.*)       http://%1/$1 [R,L]
 #### blogs
 ###
 RewriteRule ^([_0-9a-zA-Z-]+)/templates/(.*)			BASE/wp-inst/wp-content/blogs/$1/templates/$2 [L]
-RewriteRule ^([_0-9a-zA-Z-]+)/files/(.*)			BASE/wp-inst/wp-content/blogs/$1/files/$2 [L]
-RewriteRule ^([_0-9a-zA-Z-]+)/wp-content/blogs/(.*)/files/(.*)	BASE/wp-inst/wp-content/blogs/$1/files/$3 [L]
+RewriteRule ^([_0-9a-zA-Z-]+)/files/(.*)                  	BASE/wp-inst/wp-content/blogs.php?file=$1 [L]
+RewriteRule ^([_0-9a-zA-Z-]+)/wp-content/blogs/(.*)/files/(.*)	BASE/wp-inst/wp-content/blogs.php?file=$3 [L]
 RewriteRule ^([_0-9a-zA-Z-]+)/wp-content/themes/(.*)		BASE/wp-inst/wp-content/themes/$2 [L]
 RewriteRule ^wp-content/themes/(.*)		BASE/wp-inst/wp-content/themes/$1 [L]
 
diff --git a/wp-inst/wp-admin/admin-header.php b/wp-inst/wp-admin/admin-header.php
index 14e28c7..5747ebc 100644
--- a/wp-inst/wp-admin/admin-header.php
+++ b/wp-inst/wp-admin/admin-header.php
@@ -114,7 +114,7 @@ tinyMCE.init({
 <script type="text/javascript" src="../wp-includes/js/dbx.js"></script>
 <script type="text/javascript" src="../wp-includes/js/dbx-key.js"></script>
 
-<?php if ( current_user_can('manage_categories') ) : ?>
+<?php if ( isset($editing) && current_user_can('manage_categories') ) : ?>
 <style type="text/css">
 #newcat { width: 120px; margin-right: 5px; }
 input#catadd { 	background: #a4a4a4;
@@ -330,7 +330,6 @@ function myPload( str ) {
 		fixedExplode[count] = currentElement;
 	return fixedExplode;
 }
-
 </script>
 <?php endif; ?>
 
diff --git a/wp-inst/wp-admin/options-misc.php b/wp-inst/wp-admin/options-misc.php
index 23cbd92..6667ddf 100644
--- a/wp-inst/wp-admin/options-misc.php
+++ b/wp-inst/wp-admin/options-misc.php
@@ -12,51 +12,6 @@ return;
 <div class="wrap"> 
 <h2><?php _e('Miscellaneous Options') ?></h2> 
 <form method="post" action="options.php"> 
-<fieldset class="options">
-<legend>
-<input name="use_fileupload" type="checkbox" id="use_fileupload" value="1" <?php checked('1', get_settings('use_fileupload')); ?> />
-<label for="use_fileupload"><?php _e('Allow File Uploads') ?></label></legend>
-<table width="100%" cellspacing="2" cellpadding="5" class="editform"> 
-<tr> 
-<th width="33%" valign="top" scope="row"><?php _e('Destination directory:') ?> </th> 
-<td>
-<input name="fileupload_realpath" type="text" id="fileupload_realpath" value="<?php form_option('fileupload_realpath'); ?>" size="50" /><br />
-<?php printf(__('Recommended: <code>%s</code>'), ABSPATH . 'wp-content') ?>
-
-</td> 
-</tr> 
-<tr>
-<th valign="top" scope="row"><?php _e('URI of this directory:') ?> </th>
-<td>          
-<input name="fileupload_url" type="text" id="fileupload_url" value="<?php form_option('fileupload_url'); ?>" size="50" /><br />
-<?php printf(__('Recommended: <code>%s</code>'), get_settings('siteurl') . '/wp-content') ?>
-</td>
-</tr>
-<tr>
-<th scope="row"><?php _e('Maximum size:') ?> </th>
-<td><input name="fileupload_maxk" type="text" id="fileupload_maxk" value="<?php form_option('fileupload_maxk'); ?>" size="4" /> 
-<?php _e('Kilobytes (KB)') ?></td>
-</tr>
-<tr>
-<th valign="top" scope="row"><?php _e('Allowed file extensions:') ?></th>
-<td><input name="fileupload_allowedtypes" type="text" id="fileupload_allowedtypes" value="<?php form_option('fileupload_allowedtypes'); ?>" size="40" />
-<br />
-<?php _e('Recommended: <code>jpg jpeg png gif</code>') ?></td>
-</tr>
-<tr>
-<th scope="row"><?php _e('Minimum level to upload:') ?></th>
-<td><select name="fileupload_minlevel" id="fileupload_minlevel">
-<?php
-for ($i = 1; $i < 11; $i++) {
-if ($i == get_settings('fileupload_minlevel')) $selected = " selected='selected'";
-else $selected = '';
-echo "\n\t<option value='$i' $selected>$i</option>";
-}
-?>
-</select></td>
-</tr>
-</table> 
-</fieldset>
 <p><input name="use_linksupdate" type="checkbox" id="use_linksupdate" value="1" <?php checked('1', get_settings('use_linksupdate')); ?> />
 <label for="use_linksupdate"><?php _e('Track Links&#8217; Update Times') ?></label></p>
 <p>
@@ -64,7 +19,7 @@ echo "\n\t<option value='$i' $selected>$i</option>";
 </p>
 <p class="submit">
 <input type="hidden" name="action" value="update" />
-<input type="hidden" name="page_options" value="hack_file,use_fileupload,fileupload_realpath,fileupload_url,fileupload_allowedtypes,fileupload_maxk,fileupload_maxk,fileupload_minlevel,use_geo_positions,use_linksupdate" /> 
+<input type="hidden" name="page_options" value="hack_file,use_linksupdate" /> 
 	<input type="submit" name="Submit" value="<?php _e('Update Options') ?> &raquo;" />
 </p>
 </form> 
diff --git a/wp-inst/wp-admin/setup-config.php b/wp-inst/wp-admin/setup-config.php
index 9cf3402..38efd2b 100644
--- a/wp-inst/wp-admin/setup-config.php
+++ b/wp-inst/wp-admin/setup-config.php
@@ -105,11 +105,11 @@ switch($step) {
 	break;
 	
 	case 2:
-	$dbname = $_POST['dbname'];
-    $uname = $_POST['uname'];
-    $passwrd = $_POST['pwd'];
-    $dbhost = $_POST['dbhost'];
-	$prefix = $_POST['prefix'];
+	$dbname  = trim($_POST['dbname']);
+    $uname   = trim($_POST['uname']);
+    $passwrd = trim($_POST['pwd']);
+    $dbhost  = trim($_POST['dbhost']);
+	$prefix  = trim($_POST['prefix']);
 	if (empty($prefix)) $prefix = 'wp_';
 
     // Test the db connection.
diff --git a/wp-inst/wp-admin/upgrade-schema.php b/wp-inst/wp-admin/upgrade-schema.php
index 38bcc08..aa71c32 100644
--- a/wp-inst/wp-admin/upgrade-schema.php
+++ b/wp-inst/wp-admin/upgrade-schema.php
@@ -207,12 +207,6 @@ function populate_options() {
 	add_option('posts_per_rss', 10);
 	add_option('rss_excerpt_length', 50);
 	add_option('rss_use_excerpt', 0);
-	add_option('use_fileupload', 1);
-	add_option('fileupload_realpath', ABSPATH . 'wp-content/blogs.dir/'.$wpdb->blogid.'/files');
-	add_option('fileupload_url', get_option('siteurl') . '/files');
-	add_option('fileupload_allowedtypes', 'jpg jpeg gif png');
-	add_option('fileupload_maxk', 300);
-	add_option('fileupload_minlevel', 6);
 	add_option('mailserver_url', 'mail.example.com');
 	add_option('mailserver_login', 'login@example.com');
 	add_option('mailserver_pass', 'password');
diff --git a/wp-inst/wp-content/.htaccess b/wp-inst/wp-content/.htaccess
deleted file mode 100644
index af5824d..0000000
--- a/wp-inst/wp-content/.htaccess
+++ /dev/null
@@ -1,3 +0,0 @@
-<Files blogs>
-ForceType application/x-httpd-php
-</Files>
diff --git a/wp-inst/wp-content/blogs b/wp-inst/wp-content/blogs
deleted file mode 100644
index 8a3d17f..0000000
--- a/wp-inst/wp-content/blogs
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-define( "BLOGDEFINITION", true );
-require_once( "../wp-config.php" );
-$file = substr( $_SERVER[ 'REQUEST_URI' ], strpos( $_SERVER[ 'REQUEST_URI' ], '/files' ) + 6 );
-
-$file = ABSPATH . "wp-content/blogs.dir/" . $blog_id . '/files/' . $file;
-
-if( is_file( $file ) ) {
-	$etag = md5( $file . filemtime( $file ) );
-	$lastModified = date( "D, j M Y H:i:s ", filemtime( $file ) ) . "GMT";
-	$headers = apache_request_headers();
-	// get mime type
-	$ext = substr( $_SERVER[ 'REQUEST_URI' ], strrpos( $_SERVER[ 'REQUEST_URI' ], '.' ) + 1 );
-	$ext_list = array( "jpg" => "image/jpeg", "mp3" => "audio/mpeg", "mov" => "video/quicktime" );
-	if( $ext_list[ $ext ] ) {
-		$mimetype = $ext_list[ $ext ];
-	} else {
-		$mimetype = "image/$ext";
-	}
-
-	// from http://blog.rd2inc.com/archives/2005/03/24/making-dynamic-php-pages-cacheable/
-	if( $headers[ 'If-Range' ] == '"' . $etag . '"' || $lastModified == $headers['If-Modified-Since']) {
-		// They already have an up to date copy so tell them 
-		header('HTTP/1.1 304 Not Modified'); 
-		header('Cache-Control: private'); 
-		header('Content-Type: $mimetype'); 
-		header('ETag: "'.$etag.'"'); 
-	} else {
-		header("Content-type: $mimetype" );
-		header( "Last-Modified: " . $lastModified );
-		header( 'Accept-Ranges: bytes' );
-		header( "Content-Length: " . filesize( $file ) );
-		header( 'ETag: "' . $etag . '"' );
-		readfile( $file );
-	}
-} else {
-	// 404
-	header("HTTP/1.1 404 Not Found");
-	print "<html><head><title>Error 404! File Not Found!</title></head>";
-	print "<body>";
-	print "<h1>File Not Found!</h1>";
-	print "No! No! Run Away! This file has escaped and is running wild!";
-	print "</body></html>";
-}
-?>
diff --git a/wp-inst/wp-includes/js/tinymce/license.txt b/wp-inst/wp-includes/js/tinymce/license.txt
new file mode 100644
index 0000000..3b0396a
--- /dev/null
+++ b/wp-inst/wp-includes/js/tinymce/license.txt
@@ -0,0 +1,437 @@
+		  GNU LIBRARY GENERAL PUBLIC LICENSE

+		       Version 2, June 1991

+

+ Copyright (C) 1991 Free Software Foundation, Inc.

+ 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

+ Everyone is permitted to copy and distribute verbatim copies

+ of this license document, but changing it is not allowed.

+

+[This is the first released version of the library GPL.  It is

+ numbered 2 because it goes with version 2 of the ordinary GPL.]

+

+			    Preamble

+

+  The licenses for most software are designed to take away your

+freedom to share and change it.  By contrast, the GNU General Public

+Licenses are intended to guarantee your freedom to share and change

+free software--to make sure the software is free for all its users.

+

+  This license, the Library General Public License, applies to some

+specially designated Free Software Foundation software, and to any

+other libraries whose authors decide to use it.  You can use it for

+your libraries, too.

+

+  When we speak of free software, we are referring to freedom, not

+price.  Our General Public Licenses are designed to make sure that you

+have the freedom to distribute copies of free software (and charge for

+this service if you wish), that you receive source code or can get it

+if you want it, that you can change the software or use pieces of it

+in new free programs; and that you know you can do these things.

+

+  To protect your rights, we need to make restrictions that forbid

+anyone to deny you these rights or to ask you to surrender the rights.

+These restrictions translate to certain responsibilities for you if

+you distribute copies of the library, or if you modify it.

+

+  For example, if you distribute copies of the library, whether gratis

+or for a fee, you must give the recipients all the rights that we gave

+you.  You must make sure that they, too, receive or can get the source

+code.  If you link a program with the library, you must provide

+complete object files to the recipients so that they can relink them

+with the library, after making changes to the library and recompiling

+it.  And you must show them these terms so they know their rights.

+

+  Our method of protecting your rights has two steps: (1) copyright

+the library, and (2) offer you this license which gives you legal

+permission to copy, distribute and/or modify the library.

+

+  Also, for each distributor's protection, we want to make certain

+that everyone understands that there is no warranty for this free

+library.  If the library is modified by someone else and passed on, we

+want its recipients to know that what they have is not the original

+version, so that any problems introduced by others will not reflect on

+the original authors' reputations.

+.

+  Finally, any free program is threatened constantly by software

+patents.  We wish to avoid the danger that companies distributing free

+software will individually obtain patent licenses, thus in effect

+transforming the program into proprietary software.  To prevent this,

+we have made it clear that any patent must be licensed for everyone's

+free use or not licensed at all.

+

+  Most GNU software, including some libraries, is covered by the ordinary

+GNU General Public License, which was designed for utility programs.  This

+license, the GNU Library General Public License, applies to certain

+designated libraries.  This license is quite different from the ordinary

+one; be sure to read it in full, and don't assume that anything in it is

+the same as in the ordinary license.

+

+  The reason we have a separate public license for some libraries is that

+they blur the distinction we usually make between modifying or adding to a

+program and simply using it.  Linking a program with a library, without

+changing the library, is in some sense simply using the library, and is

+analogous to running a utility program or application program.  However, in

+a textual and legal sense, the linked executable is a combined work, a

+derivative of the original library, and the ordinary General Public License

+treats it as such.

+

+  Because of this blurred distinction, using the ordinary General

+Public License for libraries did not effectively promote software

+sharing, because most developers did not use the libraries.  We

+concluded that weaker conditions might promote sharing better.

+

+  However, unrestricted linking of non-free programs would deprive the

+users of those programs of all benefit from the free status of the

+libraries themselves.  This Library General Public License is intended to

+permit developers of non-free programs to use free libraries, while

+preserving your freedom as a user of such programs to change the free

+libraries that are incorporated in them.  (We have not seen how to achieve

+this as regards changes in header files, but we have achieved it as regards

+changes in the actual functions of the Library.)  The hope is that this

+will lead to faster development of free libraries.

+

+  The precise terms and conditions for copying, distribution and

+modification follow.  Pay close attention to the difference between a

+"work based on the library" and a "work that uses the library".  The

+former contains code derived from the library, while the latter only

+works together with the library.

+

+  Note that it is possible for a library to be covered by the ordinary

+General Public License rather than by this special one.

+.

+		  GNU LIBRARY GENERAL PUBLIC LICENSE

+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION

+

+  0. This License Agreement applies to any software library which

+contains a notice placed by the copyright holder or other authorized

+party saying it may be distributed under the terms of this Library

+General Public License (also called "this License").  Each licensee is

+addressed as "you".

+

+  A "library" means a collection of software functions and/or data

+prepared so as to be conveniently linked with application programs

+(which use some of those functions and data) to form executables.

+

+  The "Library", below, refers to any such software library or work

+which has been distributed under these terms.  A "work based on the

+Library" means either the Library or any derivative work under

+copyright law: that is to say, a work containing the Library or a

+portion of it, either verbatim or with modifications and/or translated

+straightforwardly into another language.  (Hereinafter, translation is

+included without limitation in the term "modification".)

+

+  "Source code" for a work means the preferred form of the work for

+making modifications to it.  For a library, complete source code means

+all the source code for all modules it contains, plus any associated

+interface definition files, plus the scripts used to control compilation

+and installation of the library.

+

+  Activities other than copying, distribution and modification are not

+covered by this License; they are outside its scope.  The act of

+running a program using the Library is not restricted, and output from

+such a program is covered only if its contents constitute a work based

+on the Library (independent of the use of the Library in a tool for

+writing it).  Whether that is true depends on what the Library does

+and what the program that uses the Library does.

+  

+  1. You may copy and distribute verbatim copies of the Library's

+complete source code as you receive it, in any medium, provided that

+you conspicuously and appropriately publish on each copy an

+appropriate copyright notice and disclaimer of warranty; keep intact

+all the notices that refer to this License and to the absence of any

+warranty; and distribute a copy of this License along with the

+Library.

+

+  You may charge a fee for the physical act of transferring a copy,

+and you may at your option offer warranty protection in exchange for a

+fee.

+.

+  2. You may modify your copy or copies of the Library or any portion

+of it, thus forming a work based on the Library, and copy and

+distribute such modifications or work under the terms of Section 1

+above, provided that you also meet all of these conditions:

+

+    a) The modified work must itself be a software library.

+

+    b) You must cause the files modified to carry prominent notices

+    stating that you changed the files and the date of any change.

+

+    c) You must cause the whole of the work to be licensed at no

+    charge to all third parties under the terms of this License.

+

+    d) If a facility in the modified Library refers to a function or a

+    table of data to be supplied by an application program that uses

+    the facility, other than as an argument passed when the facility

+    is invoked, then you must make a good faith effort to ensure that,

+    in the event an application does not supply such function or

+    table, the facility still operates, and performs whatever part of

+    its purpose remains meaningful.

+

+    (For example, a function in a library to compute square roots has

+    a purpose that is entirely well-defined independent of the

+    application.  Therefore, Subsection 2d requires that any

+    application-supplied function or table used by this function must

+    be optional: if the application does not supply it, the square

+    root function must still compute square roots.)

+

+These requirements apply to the modified work as a whole.  If

+identifiable sections of that work are not derived from the Library,

+and can be reasonably considered independent and separate works in

+themselves, then this License, and its terms, do not apply to those

+sections when you distribute them as separate works.  But when you

+distribute the same sections as part of a whole which is a work based

+on the Library, the distribution of the whole must be on the terms of

+this License, whose permissions for other licensees extend to the

+entire whole, and thus to each and every part regardless of who wrote

+it.

+

+Thus, it is not the intent of this section to claim rights or contest

+your rights to work written entirely by you; rather, the intent is to

+exercise the right to control the distribution of derivative or

+collective works based on the Library.

+

+In addition, mere aggregation of another work not based on the Library

+with the Library (or with a work based on the Library) on a volume of

+a storage or distribution medium does not bring the other work under

+the scope of this License.

+

+  3. You may opt to apply the terms of the ordinary GNU General Public

+License instead of this License to a given copy of the Library.  To do

+this, you must alter all the notices that refer to this License, so

+that they refer to the ordinary GNU General Public License, version 2,

+instead of to this License.  (If a newer version than version 2 of the

+ordinary GNU General Public License has appeared, then you can specify

+that version instead if you wish.)  Do not make any other change in

+these notices.

+.

+  Once this change is made in a given copy, it is irreversible for

+that copy, so the ordinary GNU General Public License applies to all

+subsequent copies and derivative works made from that copy.

+

+  This option is useful when you wish to copy part of the code of

+the Library into a program that is not a library.

+

+  4. You may copy and distribute the Library (or a portion or

+derivative of it, under Section 2) in object code or executable form

+under the terms of Sections 1 and 2 above provided that you accompany

+it with the complete corresponding machine-readable source code, which

+must be distributed under the terms of Sections 1 and 2 above on a

+medium customarily used for software interchange.

+

+  If distribution of object code is made by offering access to copy

+from a designated place, then offering equivalent access to copy the

+source code from the same place satisfies the requirement to

+distribute the source code, even though third parties are not

+compelled to copy the source along with the object code.

+

+  5. A program that contains no derivative of any portion of the

+Library, but is designed to work with the Library by being compiled or

+linked with it, is called a "work that uses the Library".  Such a

+work, in isolation, is not a derivative work of the Library, and

+therefore falls outside the scope of this License.

+

+  However, linking a "work that uses the Library" with the Library

+creates an executable that is a derivative of the Library (because it

+contains portions of the Library), rather than a "work that uses the

+library".  The executable is therefore covered by this License.

+Section 6 states terms for distribution of such executables.

+

+  When a "work that uses the Library" uses material from a header file

+that is part of the Library, the object code for the work may be a

+derivative work of the Library even though the source code is not.

+Whether this is true is especially significant if the work can be

+linked without the Library, or if the work is itself a library.  The

+threshold for this to be true is not precisely defined by law.

+

+  If such an object file uses only numerical parameters, data

+structure layouts and accessors, and small macros and small inline

+functions (ten lines or less in length), then the use of the object

+file is unrestricted, regardless of whether it is legally a derivative

+work.  (Executables containing this object code plus portions of the

+Library will still fall under Section 6.)

+

+  Otherwise, if the work is a derivative of the Library, you may

+distribute the object code for the work under the terms of Section 6.

+Any executables containing that work also fall under Section 6,

+whether or not they are linked directly with the Library itself.

+.

+  6. As an exception to the Sections above, you may also compile or

+link a "work that uses the Library" with the Library to produce a

+work containing portions of the Library, and distribute that work

+under terms of your choice, provided that the terms permit

+modification of the work for the customer's own use and reverse

+engineering for debugging such modifications.

+

+  You must give prominent notice with each copy of the work that the

+Library is used in it and that the Library and its use are covered by

+this License.  You must supply a copy of this License.  If the work

+during execution displays copyright notices, you must include the

+copyright notice for the Library among them, as well as a reference

+directing the user to the copy of this License.  Also, you must do one

+of these things:

+

+    a) Accompany the work with the complete corresponding

+    machine-readable source code for the Library including whatever

+    changes were used in the work (which must be distributed under

+    Sections 1 and 2 above); and, if the work is an executable linked

+    with the Library, with the complete machine-readable "work that

+    uses the Library", as object code and/or source code, so that the

+    user can modify the Library and then relink to produce a modified

+    executable containing the modified Library.  (It is understood

+    that the user who changes the contents of definitions files in the

+    Library will not necessarily be able to recompile the application

+    to use the modified definitions.)

+

+    b) Accompany the work with a written offer, valid for at

+    least three years, to give the same user the materials

+    specified in Subsection 6a, above, for a charge no more

+    than the cost of performing this distribution.

+

+    c) If distribution of the work is made by offering access to copy

+    from a designated place, offer equivalent access to copy the above

+    specified materials from the same place.

+

+    d) Verify that the user has already received a copy of these

+    materials or that you have already sent this user a copy.

+

+  For an executable, the required form of the "work that uses the

+Library" must include any data and utility programs needed for

+reproducing the executable from it.  However, as a special exception,

+the source code distributed need not include anything that is normally

+distributed (in either source or binary form) with the major

+components (compiler, kernel, and so on) of the operating system on

+which the executable runs, unless that component itself accompanies

+the executable.

+

+  It may happen that this requirement contradicts the license

+restrictions of other proprietary libraries that do not normally

+accompany the operating system.  Such a contradiction means you cannot

+use both them and the Library together in an executable that you

+distribute.

+.

+  7. You may place library facilities that are a work based on the

+Library side-by-side in a single library together with other library

+facilities not covered by this License, and distribute such a combined

+library, provided that the separate distribution of the work based on

+the Library and of the other library facilities is otherwise

+permitted, and provided that you do these two things:

+

+    a) Accompany the combined library with a copy of the same work

+    based on the Library, uncombined with any other library

+    facilities.  This must be distributed under the terms of the

+    Sections above.

+

+    b) Give prominent notice with the combined library of the fact

+    that part of it is a work based on the Library, and explaining

+    where to find the accompanying uncombined form of the same work.

+

+  8. You may not copy, modify, sublicense, link with, or distribute

+the Library except as expressly provided under this License.  Any

+attempt otherwise to copy, modify, sublicense, link with, or

+distribute the Library is void, and will automatically terminate your

+rights under this License.  However, parties who have received copies,

+or rights, from you under this License will not have their licenses

+terminated so long as such parties remain in full compliance.

+

+  9. You are not required to accept this License, since you have not

+signed it.  However, nothing else grants you permission to modify or

+distribute the Library or its derivative works.  These actions are

+prohibited by law if you do not accept this License.  Therefore, by

+modifying or distributing the Library (or any work based on the

+Library), you indicate your acceptance of this License to do so, and

+all its terms and conditions for copying, distributing or modifying

+the Library or works based on it.

+

+  10. Each time you redistribute the Library (or any work based on the

+Library), the recipient automatically receives a license from the

+original licensor to copy, distribute, link with or modify the Library

+subject to these terms and conditions.  You may not impose any further

+restrictions on the recipients' exercise of the rights granted herein.

+You are not responsible for enforcing compliance by third parties to

+this License.

+.

+  11. If, as a consequence of a court judgment or allegation of patent

+infringement or for any other reason (not limited to patent issues),

+conditions are imposed on you (whether by court order, agreement or

+otherwise) that contradict the conditions of this License, they do not

+excuse you from the conditions of this License.  If you cannot

+distribute so as to satisfy simultaneously your obligations under this

+License and any other pertinent obligations, then as a consequence you

+may not distribute the Library at all.  For example, if a patent

+license would not permit royalty-free redistribution of the Library by

+all those who receive copies directly or indirectly through you, then

+the only way you could satisfy both it and this License would be to

+refrain entirely from distribution of the Library.

+

+If any portion of this section is held invalid or unenforceable under any

+particular circumstance, the balance of the section is intended to apply,

+and the section as a whole is intended to apply in other circumstances.

+

+It is not the purpose of this section to induce you to infringe any

+patents or other property right claims or to contest validity of any

+such claims; this section has the sole purpose of protecting the

+integrity of the free software distribution system which is

+implemented by public license practices.  Many people have made

+generous contributions to the wide range of software distributed

+through that system in reliance on consistent application of that

+system; it is up to the author/donor to decide if he or she is willing

+to distribute software through any other system and a licensee cannot

+impose that choice.

+

+This section is intended to make thoroughly clear what is believed to

+be a consequence of the rest of this License.

+

+  12. If the distribution and/or use of the Library is restricted in

+certain countries either by patents or by copyrighted interfaces, the

+original copyright holder who places the Library under this License may add

+an explicit geographical distribution limitation excluding those countries,

+so that distribution is permitted only in or among countries not thus

+excluded.  In such case, this License incorporates the limitation as if

+written in the body of this License.

+

+  13. The Free Software Foundation may publish revised and/or new

+versions of the Library General Public License from time to time.

+Such new versions will be similar in spirit to the present version,

+but may differ in detail to address new problems or concerns.

+

+Each version is given a distinguishing version number.  If the Library

+specifies a version number of this License which applies to it and

+"any later version", you have the option of following the terms and

+conditions either of that version or of any later version published by

+the Free Software Foundation.  If the Library does not specify a

+license version number, you may choose any version ever published by

+the Free Software Foundation.

+.

+  14. If you wish to incorporate parts of the Library into other free

+programs whose distribution conditions are incompatible with these,

+write to the author to ask for permission.  For software which is

+copyrighted by the Free Software Foundation, write to the Free

+Software Foundation; we sometimes make exceptions for this.  Our

+decision will be guided by the two goals of preserving the free status

+of all derivatives of our free software and of promoting the sharing

+and reuse of software generally.

+

+			    NO WARRANTY

+

+  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO

+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.

+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR

+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY

+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE

+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR

+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE

+LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME

+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.

+

+  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN

+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY

+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU

+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR

+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE

+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING

+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A

+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF

+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH

+DAMAGES.

+

+		     END OF TERMS AND CONDITIONS

diff --git a/wp-inst/wp-includes/js/tinymce/plugins/wphelp/editor_plugin.js b/wp-inst/wp-includes/js/tinymce/plugins/wphelp/editor_plugin.js
new file mode 100644
index 0000000..204e447
--- /dev/null
+++ b/wp-inst/wp-includes/js/tinymce/plugins/wphelp/editor_plugin.js
@@ -0,0 +1,57 @@
+/* Import plugin specific language pack */

+tinyMCE.importPluginLanguagePack('wphelp', '');

+

+function TinyMCE_wphelp_getControlHTML(control_name) {

+	switch (control_name) {

+		case "wphelp":

+			var titleHelp = tinyMCE.getLang('lang_help_button_title');

+			var buttons = '<a href="javascript:tinyMCE.execInstanceCommand(\'{$editor_id}\',\'mceWordPressHelp\')" target="_self" onclick="tinyMCE.execInstanceCommand(\'{$editor_id}\',\'mceWordPressHelp\');return false;"><img id="{$editor_id}_help" src="{$pluginurl}/images/help.gif" title="'+titleHelp+'" width="20" height="20" class="mceButtonNormal" onmouseover="tinyMCE.switchClass(this,\'mceButtonOver\');" onmouseout="tinyMCE.restoreClass(this);" onmousedown="tinyMCE.restoreAndSwitchClass(this,\'mceButtonDown\');" /></a>';

+			var hiddenControls = '<div class="zerosize">'

+			+ '<input type="button" accesskey="b" onclick="tinyMCE.execInstanceCommand(\'{$editor_id}\',\'Bold\',false);" />'

+			+ '<input type="button" accesskey="i" onclick="tinyMCE.execInstanceCommand(\'{$editor_id}\',\'Italic\',false);" />'

+			+ '<input type="button" accesskey="d" onclick="tinyMCE.execInstanceCommand(\'{$editor_id}\',\'Strikethrough\',false);" />'

+			+ '<input type="button" accesskey="l" onclick="tinyMCE.execInstanceCommand(\'{$editor_id}\',\'InsertUnorderedList\',false);" />'

+			+ '<input type="button" accesskey="o" onclick="tinyMCE.execInstanceCommand(\'{$editor_id}\',\'InsertOrderedList\',false);" />'

+			+ '<input type="button" accesskey="w" onclick="tinyMCE.execInstanceCommand(\'{$editor_id}\',\'Outdent\',false);" />'

+			+ '<input type="button" accesskey="q" onclick="tinyMCE.execInstanceCommand(\'{$editor_id}\',\'Indent\',false);" />'

+			+ '<input type="button" accesskey="f" onclick="tinyMCE.execInstanceCommand(\'{$editor_id}\',\'JustifyLeft\',false);" />'

+			+ '<input type="button" accesskey="c" onclick="tinyMCE.execInstanceCommand(\'{$editor_id}\',\'JustifyCenter\',false);" />'

+			+ '<input type="button" accesskey="r" onclick="tinyMCE.execInstanceCommand(\'{$editor_id}\',\'JustifyRight\',false);" />'

+			+ '<input type="button" accesskey="a" onclick="tinyMCE.execInstanceCommand(\'{$editor_id}\',\'mceLink\',true);" />'

+			+ '<input type="button" accesskey="s" onclick="tinyMCE.execInstanceCommand(\'{$editor_id}\',\'unlink\',false);" />'

+			+ '<input type="button" accesskey="m" onclick="tinyMCE.execInstanceCommand(\'{$editor_id}\',\'mceImage\',true);" />'

+			+ '<input type="button" accesskey="t" onclick="tinyMCE.execInstanceCommand(\'{$editor_id}\',\'mcewordpressmore\');" />'

+			+ '<input type="button" accesskey="u" onclick="tinyMCE.execInstanceCommand(\'{$editor_id}\',\'Undo\',false);" />'

+			+ '<input type="button" accesskey="y" onclick="tinyMCE.execInstanceCommand(\'{$editor_id}\',\'Redo\',false);" />'

+			+ '<input type="button" accesskey="e" onclick="tinyMCE.execInstanceCommand(\'{$editor_id}\',\'mceCodeEditor\',false);" />'

+			+ '<input type="button" accesskey="h" onclick="tinyMCE.execInstanceCommand(\'{$editor_id}\',\'mceWordPressHelp\',false);" />'

+			+ '</div>';

+			return buttons+hiddenControls;

+    }

+

+    return "";

+}

+

+function TinyMCE_wphelp_execCommand(editor_id, element, command, user_interface, value) {

+

+	// Handle commands

+	switch (command) {

+		case "mceWordPressHelp":

+			var template = new Array();

+

+			template['file']   = tinyMCE.baseURL + '/wp-mce-help.php';

+			template['width']  = 480;

+			template['height'] = 380;

+

+			args = {

+				resizable : 'yes',

+				scrollbars : 'yes'

+			};

+

+			tinyMCE.openWindow(template, args);

+			return true;

+	}

+

+	// Pass to next handler in chain

+	return false;

+}

diff --git a/wp-inst/wp-includes/js/tinymce/plugins/wphelp/images/help.gif b/wp-inst/wp-includes/js/tinymce/plugins/wphelp/images/help.gif
new file mode 100644
index 0000000..51a1ee4
--- /dev/null
+++ b/wp-inst/wp-includes/js/tinymce/plugins/wphelp/images/help.gif
diff --git a/wp-inst/wp-includes/js/tinymce/plugins/wphelp/langs/en.js b/wp-inst/wp-includes/js/tinymce/plugins/wphelp/langs/en.js
new file mode 100644
index 0000000..b7b2aba
--- /dev/null
+++ b/wp-inst/wp-includes/js/tinymce/plugins/wphelp/langs/en.js
@@ -0,0 +1,5 @@
+// EN lang variables

+

+tinyMCE.addToLang('',{

+help_button_title : 'Help (Alt+h)'

+});

diff --git a/wp-inst/wp-includes/js/tinymce/wp-mce-help.php b/wp-inst/wp-includes/js/tinymce/wp-mce-help.php
new file mode 100644
index 0000000..f347c92
--- /dev/null
+++ b/wp-inst/wp-includes/js/tinymce/wp-mce-help.php
@@ -0,0 +1,172 @@
+<?php
+
+require_once('../../../wp-config.php');
+
+?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title><?php _e('Rich Editor Help') ?></title>
+<link rel="stylesheet" href="<?php echo get_settings('siteurl') ?>/wp-admin/wp-admin.css?version=<?php bloginfo('version'); ?>" type="text/css" />
+<style type="text/css">
+	#wphead {
+		padding-top: 5px;
+		padding-bottom: 5px;
+		padding-left: 15px;
+		font-size: 90%;
+	}
+	#adminmenu {
+		padding-top: 2px;
+		padding-bottom: 2px;
+		padding-left: 15px;
+		font-size: 94%;
+	}
+	#user_info {
+		margin-top: 15px;
+	}
+	h2 {
+		font-size: 2em;
+		border-bottom-width: .5em;
+		margin-top: 12px;
+		margin-bottom: 2px;
+	}
+	h3 {
+		font-size: 1.1em;
+		margin-top: 20px;
+		margin-bottom: 0px;
+	}
+	#flipper {
+		margin: 5px 10px 3px;
+	}
+	#flipper div p {
+		margin-top: 0.4em;
+		margin-bottom: 0.8em;
+		text-align: justify;
+	}
+	th {
+		text-align: center;
+	}
+	.top th {
+		text-decoration: underline;
+	}
+	.top .key {
+		text-align: center;
+		width: 36px;
+	}
+	.top .action {
+		text-align: left;
+	}
+	.align {
+		border-left: 3px double #333;
+		border-right: 3px double #333;
+	}
+	#keys p {
+		display: inline-block;
+		margin: 0px;
+		padding: 0px;
+	}
+	#keys .left { text-align: left; }
+	#keys .center { text-align: center; }
+	#keys .right { text-align: right; }
+	td b {
+		font-family: "Times New Roman" Times serif;
+	}
+	#buttoncontainer {
+		text-align: center;
+	}
+	#buttoncontainer a, #buttoncontainer a:hover {
+		border-bottom: 0px;
+	}
+</style>
+<script type="text/javascript">
+	window.onkeydown = window.onkeypress = function (e) {
+		e = e ? e : window.event;
+		if ( e.keyCode == 27 && !e.shiftKey && !e.controlKey && !e.altKey ) {
+			window.close();
+		}
+	}
+
+	function d(id) { return document.getElementById(id); }
+
+	function flipTab(n) {
+		for (i=1;i<=4;i++) {
+			c = d('content'+i.toString());
+			t = d('tab'+i.toString());
+			if ( n == i ) {
+				c.className = '';	
+				t.className = 'current';
+			} else {
+				c.className = 'hidden';
+				t.className = '';
+			}
+		}
+	}
+</script>
+</head>
+<body>
+<div class="zerosize"></div>
+<div id="wphead"><h1><?php echo get_bloginfo('blogtitle'); ?></h1></div>
+<div id="user_info"><p><strong><?php _e('Rich Editor Help') ?></strong></p></div>
+<ul id="adminmenu">
+	<li><a id="tab1" href="javascript:flipTab(1)" title="<?php _e('Basics of Rich Editing') ?>" accesskey="1" class="current"><?php _e('Basics') ?></a></li>
+	<li><a id="tab2" href="javascript:flipTab(2)" title="<?php _e('Advanced use of the Rich Editor') ?>" accesskey="2"><?php _e('Advanced') ?></a></li>
+	<li><a id="tab3" href="javascript:flipTab(3)" title="<?php _e('Hotkeys') ?>" accesskey="3"><?php _e('Hotkeys') ?></a></li>
+	<li><a id="tab4" href="javascript:flipTab(4)" title="<?php _e('About the software') ?>" accesskey="4"><?php _e('About') ?></a></li>
+</ul>
+
+<div id="flipper" class="wrap">
+
+<div id="content1">
+	<h2><?php _e('Rich Editing Basics') ?></h2>
+	<p><?php _e('<em>Rich editing</em>, also called WYSIWYG for What You See Is What You Get, means your text is formatted as you type. The rich editor creates HTML code behind the scenes while you concentrate on writing. Font styles, links and images all appear just as they will on the internet.') ?></p>
+	<p><?php _e('WordPress includes TinyMCE, a rich editor that works well in most web browsers used today. It is powerful but it has limitations. Pasting text from other word processors may not give the results you expect. If you do not like the way the rich editor works, you may turn it off in the My Profile form, under Users in the admin menu.') ?></p>
+	<p><?php _e('Because HTML code depends on the less-than character (&lt;) to render web pages, this character is reserved for HTML code. If you want a "<" to be visible on your site, you must encode it as "&amp;lt;" without the quotes.') ?></p>
+</div>
+
+<div id="content2" class="hidden">
+	<h2><?php _e('Advanced Rich Editing') ?></h2>
+	<h3><?php _e('Images and Attachments') ?></h3>
+	<p><?php _e('Some (not all) browsers allow you to drag images and other items directly into the editor. Most <a href="http://www.mozilla.org/products/firefox/" title="Mozilla.org, home of the Firefox web browser" target="_blank">Firefox</a> users can drag images from the uploading box (directly below the editor) and see their images instantly, complete with a link. If you cannot do this, use your clipboard Copy and Paste functions to insert the image and link tags. The rich editor will display the images after you have saved the post or used the HTML Editor to refresh the display.') ?></p>
+	<h3><?php _e('HTML in the Rich Editor') ?></h3>
+	<p><?php _e('When you want to include HTML elements that are not generated by the toolbar buttons, you must enter it by hand. Examples are &lt;pre> and &lt;code>. Simply type the code into the editor. If the code is valid and allowed by the editor, you should see it rendered the next time you update the display, usually by saving or using the HTML Editor. If you want to display "&lt;" on the web, you must encode it as "&amp;lt;" in the editor.') ?></p>
+	<h3><?php _e('The HTML Editor') ?></h3>
+	<p><?php _e('The editor will not always understand your intentions as your editing gets more complex. Use the HTML Editor to sort out any rough spots, such as extra elements or attributes. WordPress will strip all empty &lt;p> tags and &lt;br /> tags in favor of simple newline characters. However, it will preserve any tag such as this: &lt;p class="anyclass">&lt;/p>. When using the HTML editor, all less-thans are double-encoded: &amp;amp;lt;. This ensures they display as &amp;lt; in the rich editor and &lt; on the web.') ?></p>
+</div>
+
+<div id="content3" class="hidden">
+	<h2><?php _e('Writing at Full Speed') ?></h2>
+	<p><?php _e('Rather than reaching for your mouse to click on the toolbar, use these access keys. Windows and Linux use Alt+&lt;letter>. Macintosh uses Ctrl+&lt;letter>.') ?></p>
+	<table id="keys" width="100%" border="0">
+		<tr class="top"><th class="key center"><?php _e('Key') ?></th><th class="left"><?php _e('Action') ?></th><th class="key center"><?php _e('Key') ?></th><th class="left"><?php _e('Action') ?></th></tr>
+		<tr><th>b</th><td><strong><?php _e('Bold') ?></strong></td><th>f</th><td class="align left"><?php _e('Align Left') ?></td></tr>
+		<tr><th>i</th><td><em><?php _e('Italic') ?></em></td><th>c</th><td class="align center"><?php _e('Align Center') ?></td></tr>
+		<tr><th>d</th><td><strike><?php _e('Strikethrough') ?></strike></td><th>r</th><td class="align right"><?php _e('Align Right') ?></td></tr>
+		<tr><th>l</th><td><b>&bull;</b> <?php _e('List') ?></td><th>a</th><td><?php _e('Insert <span class="anchor">Anchor</span>') ?></td></tr>
+		<tr><th>o</th><td>1. <?php _e('List') ?></td><th>s</th><td><?php _e('Unlink Anchor') ?></td></tr>
+		<tr><th>q</th><td>&rarr;<?php _e('Quote/Indent') ?></td><th>m</th><td><?php _e('Insert Image') ?></td></tr>
+		<tr><th>w</th><td>&larr;<?php _e('Unquote/Outdent') ?></td><th>t</th><td><?php _e('Insert "More" Tag') ?></td></tr>
+		<tr><th>u</th><td><?php _e('Undo') ?></td><th>e</th><td><?php _e('Edit HTML') ?></td></tr>
+		<tr><th>y</th><td><?php _e('Redo') ?></td><th>h</th><td><?php _e('Open Help') ?></td></tr>
+	</table>
+</div>
+
+<div id="content4" class="hidden">
+	<h2><?php _e('About TinyMCE'); ?></h2>
+	<p><?php printf(__('Version: %s'), '2.0RC4') ?></p>
+	<p><?php printf(__('TinyMCE is a platform independent web based Javascript HTML WYSIWYG editor control released as Open Source under %sLGPL</a>	by Moxiecode Systems AB. It has the ability to convert HTML TEXTAREA fields or other HTML elements to editor instances.'), '<a href="'.get_bloginfo('home').'/wp-includes/js/tinymce/license.txt" target="_blank" title="'.__('GNU Library General Public Licence').'">') ?></p>
+	<p><?php _e('Copyright &copy; 2005, <a href="http://www.moxiecode.com" target="_blank">Moxiecode Systems AB</a>, All rights reserved.') ?></p>
+	<p><?php _e('For more information about this software visit the <a href="http://tinymce.moxiecode.com" target="_blank">TinyMCE website</a>.') ?></p>
+
+	<div id="buttoncontainer">
+		<a href="http://www.moxiecode.com" target="_new"><img src="http://tinymce.moxiecode.com/images/gotmoxie.png" alt="<?php _e('Got Moxie?') ?>" border="0" /></a>
+		<a href="http://sourceforge.net/projects/tinymce/" target="_blank"><img src="http://sourceforge.net/sflogo.php?group_id=103281" alt="<?php _e('Hosted By Sourceforge') ?>" border="0" /></a>
+		<a href="http://www.freshmeat.net/projects/tinymce" target="_blank"><img src="http://tinymce.moxiecode.com/images/fm.gif" alt="<?php _e('Also on freshmeat') ?>" border="0" /></a>
+	</div>
+
+</div>
+
+</div>
+
+</body>
+</html>
+