diff --git a/library/model/common/setting.php b/library/model/common/setting.php index f0dd61c9f..49eb15899 100644 --- a/library/model/common/setting.php +++ b/library/model/common/setting.php @@ -3,67 +3,6 @@ /// All rights reserved. Licensed under the GPL. /// See the GNU General Public License for more details. (/documents/LICENSE, /documents/COPYRIGHT) -//global $userSetting; -//$userSetting = array(); - -/* TO BE DEPRECATED SINCE 1.9 -function clearServiceSettingCache() { - global $__serviceSetting; - if( !empty($__serviceSetting) ) { - $__serviceSetting = array(); - } -} - -function clearUserSettingCache() { - global $userSetting; - if( !empty($userSetting) ) { - $userSetting = array(); - } -} - -function getServiceSetting($name, $default = null) { - return Setting::getServiceSetting($name, $default, true); -} - -function setServiceSetting($name, $value) { - return Setting::setServiceSettingGlobal($name, $value); -} - -function removeServiceSetting($name,$pruneSimilarEntries = false) { - global $database; - clearServiceSettingCache(); - if($pruneSimilarEntries) return POD::execute("DELETE FROM {$database['prefix']}ServiceSettings WHERE name like '".POD::escapeString($name)."'"); - else return POD::execute("DELETE FROM {$database['prefix']}ServiceSettings WHERE name = '".POD::escapeString($name)."'"); -} - -function getBlogSetting($name, $default = null, $blogid = null) { - return Setting::getBlogSettingGlobal($name, $default); -} - -function setBlogSetting($name, $value, $blogid = null) { - return Setting::setBlogSettingGlobal($name, $value, $blogid); -} - -function setBlogSettingDefault($name, $value, $blogid = null) { - return Setting::setBlogSettingDefault($name, $value, $blogid); -} - -function removeBlogSetting($name, $blogid = null) { - return Setting::removeBlogSettingGlobal($name, $blogid); -} - -function getUserSetting($name, $default = null, $userid = null) { - return Setting::getUserSettingGlobal($name, $default, $userid); -} - -function setUserSetting($name, $value, $userid = null) { - return Setting::setUserSettingGlobal($name, $value, $userid); -} - -function removeUserSetting($name, $userid = null) { - return Setting::removeUserSettingGlobal($name, $userid); -} -*/ function getDefinedTableNames() { $context = Model_Context::getInstance(); $prefix = $context->getProperty('database.prefix');