← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/moin/oneiric

« back to all changes in this revision

Viewing changes to MoinMoin/web/static/htdocs/applets/FCKeditor/editor/filemanager/connectors/php/io.php

  • Committer: Bazaar Package Importer
  • Author(s): Clint Byrum
  • Date: 2010-08-11 12:35:34 UTC
  • mfrom: (0.1.19 sid)
  • Revision ID: james.westby@ubuntu.com-20100811123534-q8zu7qrwqul6cvec
Tags: 1.9.3-1ubuntu1
https://launchpad.net/bugs/586518
* Merge from Debian unstable (LP: #586518). Based on work by Stefan Ebner.
  Remaining changes:
 - Remove python-xml from Suggests field, the package isn't anymore in
   sys.path.
 - Demote fckeditor from Recommends to Suggests; the code was previously
   embedded in moin, but it was also disabled, so there's no reason 
   for us to pull this in by default currently. Note: fckeditor has a
   number of security problems and so this change probably needs to be
   carried indefinitely.

Show diffs side-by-side

added added

removed removed

Lines of Context:
MoinMoin/web/static/htdocs/applets/FCKeditor/editor/filemanager/connectors/php/io.php
1
1
<?php
2
2
/*
3
3
 * FCKeditor - The text editor for Internet - http://www.fckeditor.net
4
 
 * Copyright (C) 2003-2009 Frederico Caldeira Knabben
 
4
 * Copyright (C) 2003-2010 Frederico Caldeira Knabben
5
5
 *
6
6
 * == BEGIN LICENSE ==
7
7
 *
98
98
        }
99
99
 
100
100
        // Check if the parent exists, or create it.
101
 
        if ( !file_exists( $sParent ) )
 
101
        if ( !empty($sParent) && !file_exists( $sParent ) )
102
102
        {
103
103
                //prevents agains infinite loop when we can't create root folder
104
104
                if ( !is_null( $lastFolder ) && $lastFolder === $sParent) {