Fixes #790: Removing unneeded @s.

git-svn-id: http://code.elgg.org/elgg/trunk@3513 36083f99-b078-4883-b0ff-0f9b5a30f544

diff --git a/engine/lib/entities.php b/engine/lib/entities.php
index aadbdc835f70dbac5ff15b7c556ec582f7edb785..3eaea5136e1e9453246548dd41ee7cddc372730f 100644 (file)
--- a/engine/lib/entities.php
+++ b/engine/lib/entities.php
@@ -2358,7 +2358,7 @@
                if (isset($page[0])) {
                        global $CONFIG;
                        set_input('guid',$page[0]);
-                       @include($CONFIG->path . "entities/index.php");
+                       include($CONFIG->path . "entities/index.php");
                }
        }
        

diff --git a/engine/lib/notification.php b/engine/lib/notification.php
index 6b91a67cf02a64cd571e2c114cef0a1b38ba7aad..d80c17ca059100b90f12a272ec54575ea1441ea0 100644 (file)
--- a/engine/lib/notification.php
+++ b/engine/lib/notification.php
@@ -315,7 +315,7 @@
        function notification_user_settings_save() {
                
                global $CONFIG;
-               @include($CONFIG->path . "actions/notifications/settings/usersettings/save.php");
+               include($CONFIG->path . "actions/notifications/settings/usersettings/save.php");
                
        }
        

diff --git a/engine/lib/users.php b/engine/lib/users.php
index e086c8236d8060d2ab017ab6195480f48aed2f89..3a65aac56ce5b881d85c3c2981178ca765ae919f 100644 (file)
--- a/engine/lib/users.php
+++ b/engine/lib/users.php
@@ -1373,7 +1373,7 @@
         * Page handler for dashboard
         */
        function dashboard_page_handler($page_elements) {
-               @require_once(dirname(dirname(dirname(__FILE__))) . "/dashboard/index.php");
+               require_once(dirname(dirname(dirname(__FILE__))) . "/dashboard/index.php");
        }
 
        /**
@@ -1550,11 +1550,11 @@
        function users_settings_save() {
                
                global $CONFIG;
-               @include($CONFIG->path . "actions/user/name.php");
-               @include($CONFIG->path . "actions/user/password.php");
-               @include($CONFIG->path . "actions/email/save.php");
-               @include($CONFIG->path . "actions/user/language.php");
-               @include($CONFIG->path . "actions/user/default_access.php");
+               include($CONFIG->path . "actions/user/name.php");
+               include($CONFIG->path . "actions/user/password.php");
+               include($CONFIG->path . "actions/email/save.php");
+               include($CONFIG->path . "actions/user/language.php");
+               include($CONFIG->path . "actions/user/default_access.php");
                
        }
        

diff --git a/engine/lib/version.php b/engine/lib/version.php
index 2476a0b7511e797d32dcf61b0a589cc8e913a281..8251efe678bebc17fdd404e1e470ab1c1e591deb 100644 (file)
--- a/engine/lib/version.php
+++ b/engine/lib/version.php
@@ -48,7 +48,7 @@
                if (sizeof($upgrades) > 0) {
                        foreach($upgrades as $upgrade) {
                                try {
-                                       @include($CONFIG->path . 'engine/lib/upgrades/' . $upgrade);
+                                       include($CONFIG->path . 'engine/lib/upgrades/' . $upgrade);
                                } catch (Exception $e) {
                                        error_log($e->getmessage());
                                }       
@@ -71,7 +71,7 @@
                function get_version($humanreadable = false) {
                        
                        global $CONFIG;
-                       if (@include($CONFIG->path . "version.php")) {
+                       if (include($CONFIG->path . "version.php")) {
                                if (!$humanreadable) return $version;
                                return $release;
                        }