Changeset 1294

Timestamp:

05/16/08 12:33:45 (7 months ago)

Author:

donncha

Message:

WP Merge, page template validation

Files:

• trunk/wp-admin/includes/file.php (modified) (1 diff)
• trunk/wp-includes/functions.php (modified) (1 diff)
• trunk/wp-includes/theme.php (modified) (1 diff)

trunk/wp-admin/includes/file.php

@@ -55 +55 @@
-
-        return '/tmp/';
-}
-
-function validate_file( $file, $allowed_files = '' ) {
-        if ( false !== strpos( $file, '..' ))
-                return 1;
-
-        if ( false !== strpos( $file, './' ))
-                return 1;
-
-        if (':' == substr( $file, 1, 1 ))
-                return 2;
-
-        if (!empty ( $allowed_files ) && (!in_array( $file, $allowed_files ) ) )
-                return 3;
-
-        return 0;
-}
-

trunk/wp-includes/functions.php

@@ -1763 +1763 @@
-}
-
+function validate_file( $file, $allowed_files = '' ) {
+        if ( false !== strpos( $file, '..' ))
+                return 1;
+
+        if ( false !== strpos( $file, './' ))
+                return 1;
+
+        if (':' == substr( $file, 1, 1 ))
+                return 2;
+
+        if (!empty ( $allowed_files ) && (!in_array( $file, $allowed_files ) ) )
+                return 3;
+
+        return 0;
+}
+
-?>

trunk/wp-includes/theme.php

@@ -420 +420 @@
-                $template = '';
-
-
+!validate_file($template) && 
-                $template = TEMPLATEPATH . "/$template";
-        elseif ( file_exists(TEMPLATEPATH . "/page.php") )