Version 4.6.0
This commit is contained in:
1 parent
f79dcf067a
commit
517a5e1f70
2036 files changed
+110041
-26162
No files matched your search
@@ -188,13 +188,19 @@ class _Javascript extends \IPS\Patterns\ActiveRecord
|
||||
|
||||
if ( \IPS\IN_DEV AND $this->location == 'plugins' )
|
||||
{
|
||||
/* Write the file to disk in the correct location */
|
||||
$file = \IPS\ROOT_PATH . '/plugins/' . $this->plugin . '/dev/js/' . $this->name;
|
||||
|
||||
if ( \is_file( $file ) )
|
||||
try
|
||||
{
|
||||
\unlink( $file );
|
||||
$plugin = \IPS\Plugin::load( $this->plugin );
|
||||
|
||||
/* Write the file to disk in the correct location */
|
||||
$file = \IPS\ROOT_PATH . '/plugins/' . $plugin->location . '/dev/js/' . $this->name;
|
||||
|
||||
if ( \is_file( $file ) )
|
||||
{
|
||||
\unlink( $file );
|
||||
}
|
||||
}
|
||||
catch( \OutOfRangeException $e ) {}
|
||||
}
|
||||
|
||||
$_where = "javascript_app=? AND javascript_location=? AND javascript_path=? AND javascript_name=?";
|
||||
@@ -373,8 +379,7 @@ class _Javascript extends \IPS\Patterns\ActiveRecord
|
||||
}
|
||||
|
||||
/* Open XML file */
|
||||
$xml = new \IPS\Xml\XMLReader;
|
||||
$xml->open( $file );
|
||||
$xml = \IPS\Xml\XMLReader::safeOpen( $file );
|
||||
$xml->read();
|
||||
|
||||
$app = $xml->getAttribute('app');
|
||||
@@ -502,8 +507,7 @@ class _Javascript extends \IPS\Patterns\ActiveRecord
|
||||
/* Open XML file */
|
||||
if( file_exists( \IPS\ROOT_PATH . '/applications/' . $app . '/data/javascript.xml' ) )
|
||||
{
|
||||
$xml = new \IPS\Xml\XMLReader;
|
||||
$xml->open( \IPS\ROOT_PATH . '/applications/' . $app . '/data/javascript.xml' );
|
||||
$xml = \IPS\Xml\XMLReader::safeOpen( \IPS\ROOT_PATH . '/applications/' . $app . '/data/javascript.xml' );
|
||||
$xml->read();
|
||||
|
||||
while( $xml->read() )
|
||||
|
||||
Reference in new issue
Block a user