Revision: 12470
http://squirrelmail.svn.sourceforge.net/squirrelmail/?rev=12470&view=rev
Author: kink
Date: 2007-06-25 12:42:12 -0700 (Mon, 25 Jun 2007)
Log Message:
-----------
- Fix compatibility with Windows path in administrator plugin (#1740469).
Modified Paths:
--------------
branches/SM-1_4-STABLE/squirrelmail/ChangeLog
branches/SM-1_4-STABLE/squirrelmail/plugins/administrator/options.php
Modified: branches/SM-1_4-STABLE/squirrelmail/ChangeLog
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/ChangeLog 2007-06-25 19:33:52 UTC
(rev 12469)
+++ branches/SM-1_4-STABLE/squirrelmail/ChangeLog 2007-06-25 19:42:12 UTC
(rev 12470)
@@ -15,6 +15,7 @@
- Always treat Content-Type case-insensitively (#1732092).
- Fix typo: html/plain should be text/html.
- Fix en/decode header swith in MDN (#1694687).
+ - Fix compatibility with Windows path in administrator plugin (#1740469).
Version 1.4.10a - 10 May 2007
-----------------------------
Modified: branches/SM-1_4-STABLE/squirrelmail/plugins/administrator/options.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/plugins/administrator/options.php
2007-06-25 19:33:52 UTC (rev 12469)
+++ branches/SM-1_4-STABLE/squirrelmail/plugins/administrator/options.php
2007-06-25 19:42:12 UTC (rev 12470)
@@ -164,6 +164,7 @@
* ../images/logo.gif --> SM_PATH . 'images/logo.gif'
* images/logo.gif --> SM_PATH . 'config/images/logo.gif'
* /absolute/path/logo.gif --> '/absolute/path/logo.gif'
+ * C:/absolute/win/path --> 'C:/absolute/win/path'
* http://whatever/ --> 'http://whatever'
*
* @param string $old_path path that has to be converted
@@ -173,7 +174,8 @@
function change_to_sm_path($old_path) {
if ( $old_path === '' || $old_path == "''" ) {
return "''";
- } elseif ( preg_match("/^(\/|http)/", $old_path) ) {
+ } elseif ( preg_match("/^(\/|http)/", $old_path) ||
+ substr($old_path,1,2) == ':/' ) {
return "'" . $old_path . "'";
} elseif ( preg_match("/^(\$|SM_PATH)/", $old_path) ) {
return $old_path;
@@ -631,4 +633,4 @@
'</big></p>';
}
?>
-</body></html>
\ No newline at end of file
+</body></html>
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
|
