Changeset 3029

Timestamp:

11/10/05 23:25:39 (3 years ago)

Author:

ryan

Message:

Add radio button for our default permalink structure. Add got_mod_rewrite(). Props Mark Jaquith. fixes #1840

Files:

• trunk/wp-admin/admin-functions.php (modified) (2 diffs)
• trunk/wp-admin/options-permalink.php (modified) (3 diffs)

trunk/wp-admin/admin-functions.php

@@ -976 +976 @@
-}
-
+function got_mod_rewrite() {
+    global $is_apache;
+
+    // take 3 educated guesses as to whether or not mod_rewrite is available
+    if ( !$is_apache )
+        return false;
+
+    if ( function_exists('apache_get_modules') ) {
+        if ( !in_array('mod_rewrite', apache_get_modules()) )
+            return false;
+    }
+
+    if ( function_exists('ob_get_clean') ) {
+      ob_start();
+      phpinfo(INFO_MODULES);
+      $php_modules = ob_get_clean();
+      if ( strpos($php_modules, 'mod_rewrite') === false)
+        return false;
+    }
+
+    return true;
+}
+
-function save_mod_rewrite_rules() {
-    global $is_apache, $wp_rewrite;
@@ -986 +1009 @@
-        return;
-
-$is_apache
+ got_mod_rewrite()
-        return;
-

trunk/wp-admin/options-permalink.php

@@ -104 +104 @@
-<?php
-$prefix = '';
-
+
+
-    $prefix = '/index.php';
+
+$structures = array(
+    '',
+    $prefix . '/%year%/%monthnum%/%day%/%postname%/',
+    $prefix . '/archives/%post_id%'
+    );
-?>
-<form name="form" action="options-permalink.php" method="post"> 
@@ -111 +118 @@
-<p>
-    <label>
-<?php echo $prefix; ?>/%year%/%monthnum%/%day%/%postname%/" class="tog" <?php checked( $prefix . '/%year%/%monthnum%/%day%/%postname%/
-ate and name based, example:'); ?> <code><?php echo get_settings('home') . $prefix . '/' . date('Y') . '/' . date('m') . '/' . date('d') . '/sample-post/'; ?></code
+" class="tog" <?php checked('
+efault'); ?><br /> <span> &raquo; <code><?php echo get_settings('home'); ?>/?p=123</code></span
-   </label>
-</p>
-<p>
-    <label>
-
-
+
+
+
+
+
+
+
+
-   </label>
-</p>
@@ -124 +137 @@
-<label>
-<input name="selection" type="radio" value="custom" class="tog"
-$permalink_structure != $prefix . '/archives/%post_id%' && $permalink_structure != $prefix . '/%year%/%monthnum%/%day%/%postname%/'
+!in_array($permalink_structure, $structures)
-checked="checked"
-<?php } ?>