aboutsummaryrefslogtreecommitdiffstats
path: root/admin/site_reader_remote.php
diff options
context:
space:
mode:
authorpatdenice <patdenice@piwigo.org>2008-11-23 17:25:24 +0000
committerpatdenice <patdenice@piwigo.org>2008-11-23 17:25:24 +0000
commit60f2d18f1fbceff44fcd43eab9528441ea126377 (patch)
treed28a6238a28ffc047002e7348eec51cb6459e7b6 /admin/site_reader_remote.php
parenta1e6ae0f159e9cae29683078e358e10d7675badd (diff)
merge -c2902 from trunk to branch 2.0.
- Add home and identification buttons after installation. - Use fetchRemote function for remote site actions. - Corrections in fetchRemote fnction. - Move PLUGIN_PICTURE_BEFORE in picture.tpl. git-svn-id: http://piwigo.org/svn/branches/2.0@2903 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'admin/site_reader_remote.php')
-rw-r--r--admin/site_reader_remote.php5
1 files changed, 2 insertions, 3 deletions
diff --git a/admin/site_reader_remote.php b/admin/site_reader_remote.php
index 31ae3e792..5c350acf8 100644
--- a/admin/site_reader_remote.php
+++ b/admin/site_reader_remote.php
@@ -48,7 +48,7 @@ function RemoteSiteReader($url, $listing_url)
if (!isset($listing_url))
{
- $this->listing_url = $this->site_url.'/listing.xml';
+ $this->listing_url = $this->site_url.'listing.xml';
}
else
{
@@ -65,11 +65,10 @@ function open()
{
global $errors;
- if (@fopen($this->listing_url, 'r'))
+ if ($xml_content = getXmlCode($this->listing_url))
{
$this->site_dirs = array();
$this->site_files = array();
- $xml_content = getXmlCode($this->listing_url);
$info_xml_element = getChild($xml_content, 'informations');
if (getAttribute($info_xml_element , 'phpwg_version') != PHPWG_VERSION)
{