[no-wp] r241 committed - for good measure...
no...@googlecode.com
Author: peter.holme
Date: Mon Jan 17 02:31:00 2011
Log: for good measure...
http://code.google.com/p/no-wp/source/detail?r=241
Added:
/plugins/wordpress-mu-domain-mapping/tags/0.5.3/diff.txt
/plugins/wordpress-mu-domain-mapping/trunk/diff.txt
=======================================
--- /dev/null
+++ /plugins/wordpress-mu-domain-mapping/tags/0.5.3/diff.txt Mon Jan 17
02:31:00 2011
@@ -0,0 +1,83 @@
+Index: domain_mapping.php
+===================================================================
+--- domain_mapping.php (revision 333454)
++++ domain_mapping.php (working copy)
+@@ -26,7 +26,7 @@
+ */
+
+ function dm_text_domain() {
+- load_plugin_textdomain( 'wordpress-mu-domain-mapping', basename(
dirname( __FILE__ ) ) . 'languages', basename( dirname( __FILE__ )
) . '/languages' );
++ load_plugin_textdomain( 'wordpress-mu-domain-mapping', basename(
dirname( __FILE__ )
) . 'languages', 'wordpress-mu-domain-mapping/languages' );
+ }
+ add_action( 'init', 'dm_text_domain' );
+
+@@ -48,11 +48,11 @@
+ maybe_create_db();
+
+ if ( get_site_option( 'dm_user_settings' ) && $current_site->blog_id !=
$wpdb->blogid && !dm_sunrise_warning( false ) ) {
+- add_management_page( 'Domain Mapping', 'Domain
Mapping', 'manage_options', 'domainmapping', 'dm_manage_page' );
++ add_management_page(__( 'Domain
Mapping', 'wordpress-mu-domain-mapping'), __( 'Domain
Mapping', 'wordpress-mu-domain-mapping'), 'manage_options', 'domainmapping', 'dm_manage_page'
);
+ }
+ if( is_site_admin() ) {
+- add_submenu_page('wpmu-admin.php', 'Domain Mapping', 'Domain
Mapping', 'manage_options', 'dm_admin_page', 'dm_admin_page');
+-
add_submenu_page('wpmu-admin.php', 'Domains', 'Domains', 'manage_options', 'dm_domains_admin', 'dm_domains_admin');
++ add_submenu_page('wpmu-admin.php', __( 'Domain
Mapping', 'wordpress-mu-domain-mapping'), __( 'Domain
Mapping', 'wordpress-mu-domain-mapping'), 'manage_options', 'dm_admin_page', 'dm_admin_page');
++ add_submenu_page('wpmu-admin.php',
__( 'Domains', 'wordpress-mu-domain-mapping'),
__( 'Domains', 'wordpress-mu-domain-mapping'), 'manage_options', 'dm_domains_admin', 'dm_domains_admin');
+ }
+ }
+ add_action( 'admin_menu', 'dm_add_pages' );
+@@ -132,7 +132,7 @@
+ switch( $_POST[ 'action' ] ) {
+ default:
+ }
+- echo '<h2>' . __( 'Domain Mapping: Domains' ) . '</h2>';
++ echo '<h2>' . __( 'Domain Mapping:
Domains', 'wordpress-mu-domain-mapping' ) . '</h2>';
+ if ( !empty( $_POST[ 'action' ] ) ) {
+ check_admin_referer( 'domain_mapping' );
+ switch( $_POST[ 'action' ] ) {
+@@ -279,7 +279,7 @@
+ }
+ }
+
+- echo '<h3>' . __( 'Domain Mapping Configuration' ) . '</h3>';
++ echo '<h3>' . __( 'Domain Mapping
Configuration', 'wordpress-mu-domain-mapping' ) . '</h3>';
+ echo '<form method="POST">';
+ echo '<input type="hidden" name="action" value="update" />';
+ echo "<p>" . __( "As a super admin on this network you can set the IP
address users need to point their DNS A records at <em>or</em> the domain
to point CNAME record at. If you don't know what the IP address is, ping
this blog to get it.", 'wordpress-mu-domain-mapping' ) . "</p>";
+@@ -311,7 +311,7 @@
+ echo get_site_option( 'dm_no_primary_domain' ) ==
1 ? "checked='checked'" : "";
+ echo " /> " . __( "Disable primary domain check. Sites will not redirect
to one domain name. May cause duplicate content
issues.", 'wordpress-mu-domain-mapping' ) . "</li></ol>";
+ wp_nonce_field( 'domain_mapping' );
+- echo "<input type='submit' value='Save' />";
++ echo "<input type='submit' value='" .
__( "Save", 'wordpress-mu-domain-mapping' ) . "' />";
+ echo "</form><br />";
+ }
+
+@@ -459,13 +459,13 @@
+ echo __( '<strong>Warning!</strong> Primary domains are currently
disabled.', 'wordpress-mu-domain-mapping' );
+ }
+ }
+- echo "<h3>" . __( 'Add new domain' ) . "</h3>";
++ echo "<h3>" . __( 'Add new domain', 'wordpress-mu-domain-mapping'
) . "</h3>";
+ echo '<form method="POST">';
+ echo '<input type="hidden" name="action" value="add" />';
+ echo "http://<input type='text' name='domain' value='' />/<br />";
+ wp_nonce_field( 'domain_mapping' );
+ echo "<input type='checkbox' name='primary' value='1' /> " .
__( 'Primary domain for this blog', 'wordpress-mu-domain-mapping' ) . "<br
/>";
+- echo "<input type='submit' value='Add' />";
++ echo "<input type='submit' value='" .
__( "Add", 'wordpress-mu-domain-mapping' ) . "' />";
+ echo "</form><br />";
+
+ if ( get_site_option( 'dm_cname' ) ) {
+Index: readme.txt
+===================================================================
+--- readme.txt (revision 333454)
++++ readme.txt (working copy)
+@@ -32,6 +32,7 @@
+ * Giving your users the option to just use your chosen domain name and
not an IP (or list of IP's) to set as their CNAME will make administration
of your WordPressMU blog platform or WordPress 3.0 network easier, an
example of this would be purchasing/deploying a new server or indeed adding
more servers to use in a round robin scenario. Your end users have no need
to worry about IP address changes.
+ * Finally, telling your end users to use an ANAME IP or CNAME domain name
is up to you and how your systems are deployed.
+ * Further Reading: http://www.faqs.org/rfcs/rfc2219.html
++* For localization: place translation files (ie.
wordpress-mu-domain-mapping-xx_XX.mo) in the directory
wp-content/plugins/wordpress-mu-domain-mapping/languages. You will probably
have to create that directory yourself.
+
+ == Upgrade Notice ==
+
=======================================
--- /dev/null
+++ /plugins/wordpress-mu-domain-mapping/trunk/diff.txt Mon Jan 17 02:31:00
2011
@@ -0,0 +1,83 @@
+Index: domain_mapping.php
+===================================================================
+--- domain_mapping.php (revision 333454)
++++ domain_mapping.php (working copy)
+@@ -26,7 +26,7 @@
+ */
+
+ function dm_text_domain() {
+- load_plugin_textdomain( 'wordpress-mu-domain-mapping', basename(
dirname( __FILE__ ) ) . 'languages', basename( dirname( __FILE__ )
) . '/languages' );
++ load_plugin_textdomain( 'wordpress-mu-domain-mapping', basename(
dirname( __FILE__ )
) . 'languages', 'wordpress-mu-domain-mapping/languages' );
+ }
+ add_action( 'init', 'dm_text_domain' );
+
+@@ -48,11 +48,11 @@
+ maybe_create_db();
+
+ if ( get_site_option( 'dm_user_settings' ) && $current_site->blog_id !=
$wpdb->blogid && !dm_sunrise_warning( false ) ) {
+- add_management_page( 'Domain Mapping', 'Domain
Mapping', 'manage_options', 'domainmapping', 'dm_manage_page' );
++ add_management_page(__( 'Domain
Mapping', 'wordpress-mu-domain-mapping'), __( 'Domain
Mapping', 'wordpress-mu-domain-mapping'), 'manage_options', 'domainmapping', 'dm_manage_page'
);
+ }
+ if( is_site_admin() ) {
+- add_submenu_page('wpmu-admin.php', 'Domain Mapping', 'Domain
Mapping', 'manage_options', 'dm_admin_page', 'dm_admin_page');
+-
add_submenu_page('wpmu-admin.php', 'Domains', 'Domains', 'manage_options', 'dm_domains_admin', 'dm_domains_admin');
++ add_submenu_page('wpmu-admin.php', __( 'Domain
Mapping', 'wordpress-mu-domain-mapping'), __( 'Domain
Mapping', 'wordpress-mu-domain-mapping'), 'manage_options', 'dm_admin_page', 'dm_admin_page');
++ add_submenu_page('wpmu-admin.php',
__( 'Domains', 'wordpress-mu-domain-mapping'),
__( 'Domains', 'wordpress-mu-domain-mapping'), 'manage_options', 'dm_domains_admin', 'dm_domains_admin');
+ }
+ }
+ add_action( 'admin_menu', 'dm_add_pages' );
+@@ -132,7 +132,7 @@
+ switch( $_POST[ 'action' ] ) {
+ default:
+ }
+- echo '<h2>' . __( 'Domain Mapping: Domains' ) . '</h2>';
++ echo '<h2>' . __( 'Domain Mapping:
Domains', 'wordpress-mu-domain-mapping' ) . '</h2>';
+ if ( !empty( $_POST[ 'action' ] ) ) {
+ check_admin_referer( 'domain_mapping' );
+ switch( $_POST[ 'action' ] ) {
+@@ -279,7 +279,7 @@
+ }
+ }
+
+- echo '<h3>' . __( 'Domain Mapping Configuration' ) . '</h3>';
++ echo '<h3>' . __( 'Domain Mapping
Configuration', 'wordpress-mu-domain-mapping' ) . '</h3>';
+ echo '<form method="POST">';
+ echo '<input type="hidden" name="action" value="update" />';
+ echo "<p>" . __( "As a super admin on this network you can set the IP
address users need to point their DNS A records at <em>or</em> the domain
to point CNAME record at. If you don't know what the IP address is, ping
this blog to get it.", 'wordpress-mu-domain-mapping' ) . "</p>";
+@@ -311,7 +311,7 @@
+ echo get_site_option( 'dm_no_primary_domain' ) ==
1 ? "checked='checked'" : "";
+ echo " /> " . __( "Disable primary domain check. Sites will not redirect
to one domain name. May cause duplicate content
issues.", 'wordpress-mu-domain-mapping' ) . "</li></ol>";
+ wp_nonce_field( 'domain_mapping' );
+- echo "<input type='submit' value='Save' />";
++ echo "<input type='submit' value='" .
__( "Save", 'wordpress-mu-domain-mapping' ) . "' />";
+ echo "</form><br />";
+ }
+
+@@ -459,13 +459,13 @@
+ echo __( '<strong>Warning!</strong> Primary domains are currently
disabled.', 'wordpress-mu-domain-mapping' );
+ }
+ }
+- echo "<h3>" . __( 'Add new domain' ) . "</h3>";
++ echo "<h3>" . __( 'Add new domain', 'wordpress-mu-domain-mapping'
) . "</h3>";
+ echo '<form method="POST">';
+ echo '<input type="hidden" name="action" value="add" />';
+ echo "http://<input type='text' name='domain' value='' />/<br />";
+ wp_nonce_field( 'domain_mapping' );
+ echo "<input type='checkbox' name='primary' value='1' /> " .
__( 'Primary domain for this blog', 'wordpress-mu-domain-mapping' ) . "<br
/>";
+- echo "<input type='submit' value='Add' />";
++ echo "<input type='submit' value='" .
__( "Add", 'wordpress-mu-domain-mapping' ) . "' />";
+ echo "</form><br />";
+
+ if ( get_site_option( 'dm_cname' ) ) {
+Index: readme.txt
+===================================================================
+--- readme.txt (revision 333454)
++++ readme.txt (working copy)
+@@ -32,6 +32,7 @@
+ * Giving your users the option to just use your chosen domain name and
not an IP (or list of IP's) to set as their CNAME will make administration
of your WordPressMU blog platform or WordPress 3.0 network easier, an
example of this would be purchasing/deploying a new server or indeed adding
more servers to use in a round robin scenario. Your end users have no need
to worry about IP address changes.
+ * Finally, telling your end users to use an ANAME IP or CNAME domain name
is up to you and how your systems are deployed.
+ * Further Reading: http://www.faqs.org/rfcs/rfc2219.html
++* For localization: place translation files (ie.
wordpress-mu-domain-mapping-xx_XX.mo) in the directory
wp-content/plugins/wordpress-mu-domain-mapping/languages. You will probably
have to create that directory yourself.
+
+ == Upgrade Notice ==
+