Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge pull request #31 from MarkMaldaba/SomeMoreTidyingOfUnneededFiles

Some more tidying of unneeded files
  • Loading branch information...
commit 8b9e986ed964672fe241faf1fec008505bb256a4 2 parents 790dc0a + 755df5c
@phpfreak authored
View
7 application/plugins/files/controllers/FilesController.class.php
@@ -1056,8 +1056,13 @@ function detach_from_object() {
* @return null
*/
function repair() {
+ $attributesFile = ROOT . '/upload/attributes.php';
+ if (is_file($attributesFile)) {
+ $attributes = include $attributesFile;
+ } else {
+ $attributes = array();
+ }
- $attributes = include ROOT . '/upload/attributes.php';
foreach ($attributes as $k => $v) {
$files = ProjectFiles::findAll(array(
View
5 cache/.gitignore
@@ -0,0 +1,5 @@
+# Ignore everything in this directory...
+*
+
+# ...except this file
+!.gitignore
View
0  cache/empty.txt
No changes.
View
2  config/.gitignore
@@ -0,0 +1,2 @@
+# Ignore the live config.php
+config.php
View
5 public/files/.gitignore
@@ -0,0 +1,5 @@
+# Ignore everything in this directory...
+*
+
+# ...except this file
+!.gitignore
View
0  public/files/empty.txt
No changes.
View
5 tmp/.gitignore
@@ -0,0 +1,5 @@
+# Ignore everything in this directory...
+*
+
+# ...except this file
+!.gitignore
View
0  tmp/empty.txt
No changes.
View
5 tools/attributes.php
@@ -1,5 +0,0 @@
-<?php
-
-return array (
-);
-?>
View
1  tools/db2fs.log
@@ -1 +0,0 @@
-Converted files from database to file system:
View
9 tools/db2fs.php
@@ -9,9 +9,12 @@
} // if
$log_data = file_exists('db2fs.log') ? file_get_contents('db2fs.log') : "Converted files from database to file system: ";
-
- $file_attributes = require_once 'attributes.php';
-
+
+ $file_attributes = @require_once 'attributes.php';
+ if (!is_array($file_attributes)) {
+ $file_attributes = array();
+ }
+
$link = @mysql_connect(DB_HOST, DB_USER, DB_PASS);
$file_repo_table = DB_PREFIX . 'file_repo';
$file_repo_attributes_table = DB_PREFIX . 'file_repo_attributes';
View
3  tools/error_log
@@ -1,3 +0,0 @@
-[22-Jul-2011 12:32:29] PHP Warning: require() [<a href='function.require'>function.require</a>]: Unable to access ../../config/config.php in /home/sharec/public_html/pp088/tools/dbinfo.php on line 4
-[22-Jul-2011 12:32:29] PHP Warning: require(../../config/config.php) [<a href='function.require'>function.require</a>]: failed to open stream: No such file or directory in /home/sharec/public_html/pp088/tools/dbinfo.php on line 4
-[22-Jul-2011 12:32:29] PHP Fatal error: require() [<a href='function.require'>function.require</a>]: Failed opening required '../../config/config.php' (include_path='.:/usr/lib/php:/usr/local/lib/php') in /home/sharec/public_html/pp088/tools/dbinfo.php on line 4
View
5 upload/.gitignore
@@ -0,0 +1,5 @@
+# Ignore everything in this directory...
+*
+
+# ...except this file
+!.gitignore
View
6 upload/attributes.php
@@ -1,6 +0,0 @@
-<?php
-
-return array (
-);
-
-?>
View
0  upload/empty.txt
No changes.
Please sign in to comment.
Something went wrong with that request. Please try again.