Changeset 1304

Timestamp:

03/13/2008 03:05:17 PM (18 years ago)

Author:

sambauers

Message:

Force a slash to the end of JS constructed link - branches/0.8 - See #819 - Props da3rX

Location:

branches/0.8/bb-admin

Files:

• class-install.php (modified) (1 diff)
• install.php (modified) (1 diff)

branches/0.8/bb-admin/class-install.php

@@ -544 +544 @@
                                                 'value' => '',
                                                 'label' => __('WordPress database secret:'),
-                                                'note'  => __('This must match the value of the WordPress setting named "secret" in your WordPress installation. Look for the option labeled "secret" in this WordPress admin page - <a href="#" id="getSecretOption" onclick="window.open(this.href); return false;"></a>'),
+                                                'note'  => __('This must match the value of the WordPress setting named "secret" in your WordPress installation. Look for the option labeled "secret" in <a href="#" id="getSecretOption" onclick="window.open(this.href); return false;">this WordPress admin page</a>.'),
                                                 'prerequisite' => 'toggle_2_1'
                                         ),

branches/0.8/bb-admin/install.php

@@ -215 +215 @@
                                                 var outputAnchor = document.getElementById('getSecretOption');
                                                 if (siteURLInputValue) {
-                                                        outputAnchor.innerHTML = siteURLInputValue + 'wp-admin/options.php';
+                                                        if (siteURLInputValue.substr(-1,1) != '/') {
+                                                                siteURLInputValue += '/';
+                                                        }
                                                         outputAnchor.href = siteURLInputValue + 'wp-admin/options.php';
                                                 } else {
-                                                        outputAnchor.innerHTML = '';
                                                         outputAnchor.href = '';
                                                 }