Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Loading…

Namespace legacy classes #101

Merged
merged 1 commit into from

2 participants

@KorvinSzanto
Owner

No description provided.

@aembler aembler merged commit 9082a21 into concrete5:master
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on May 2, 2014
  1. @KorvinSzanto

    Namespace legacy classes

    KorvinSzanto authored
This page is out of date. Refresh to see the latest.
View
7 web/concrete/config/aliases.php
@@ -73,5 +73,8 @@
'FacebookAuthenticationTypeController' => '\Concrete\Core\Authentication\Type\Facebook',
'GroupTree' => '\Concrete\Core\Tree\Type\Group',
'GroupTreeNode' => '\Concrete\Core\Tree\Node\Type\Group',
- 'Zend_Queue_Adapter_Concrete5' => '\Concrete\Core\Utility\ZendQueueAdapter'
-);
+ 'Zend_Queue_Adapter_Concrete5' => '\Concrete\Core\Utility\ZendQueueAdapter',
+ 'Loader' => '\Concrete\Core\Legacy\Loader',
+ 'TaskPermission' => '\Concrete\Core\Legacy\TaskPermission',
+ 'FilePermissions' => '\Concrete\Core\Legacy\FilePermissions'
+);
View
16 web/concrete/controllers/single_page/dashboard/system/environment/debug.php
@@ -5,13 +5,13 @@
use Loader;
class Debug extends DashboardPageController {
-
+
public function view() {
-
+
$debug_level = Config::get('SITE_DEBUG_LEVEL');
- $this->set('debug_level', $debug_level);
+ $this->set('debug_level', $debug_level);
}
-
+
public function update_debug() {
if ($this->token->validate("update_debug")) {
if ($this->isPost()) {
@@ -23,10 +23,10 @@ public function update_debug() {
$this->set('error', array($this->token->getErrorMessage()));
}
}
-
+
public function debug_saved(){
- $this->set('message', t('Debug configuration saved.'));
+ $this->set('message', t('Debug configuration saved.'));
$this->view();
}
-
-}
+
+}
View
10 web/concrete/core/Legacy/BlockRecord.php
@@ -1,6 +1,6 @@
-<?
+<?php
namespace Concrete\Core\Legacy;
-use Loader;
+
/**
* @deprecated
*/
@@ -8,8 +8,4 @@ class BlockRecord extends Model {
public $bID;
- public function __construct($_table) {
- parent::__construct($_table);
- }
-
-}
+}
View
10 web/concrete/core/Legacy/FilePermissions.php
@@ -1,8 +1,11 @@
-<?
+<?php
+namespace Concrete\Core\Legacy;
+use FileSet;
+use Permissions;
+
/**
* @deprecated
*/
-
final class FilePermissions {
public static function getGlobal() {
@@ -10,4 +13,5 @@ public static function getGlobal() {
$fsp = new Permissions($fs);
return $fsp;
}
-}
+
+}
View
12 web/concrete/core/Legacy/Loader.php
@@ -1,4 +1,9 @@
-<?
+<?php
+namespace Concrete\Core\Legacy;
+use Database;
+use Core;
+use View;
+
/**
* @deprecated
*/
@@ -7,7 +12,7 @@ class Loader {
public static function db() {
return Database::getActiveConnection();
}
-
+
public static function helper($service, $pkgHandle = false) {
return Core::make('helper/' . $service);
}
@@ -28,5 +33,4 @@ public static function library($library, $pkgHandle = false) {
return false;
}
-
-}
+}
View
7 web/concrete/core/Legacy/Model.php
@@ -1,6 +1,6 @@
-<?
+<?php
namespace Concrete\Core\Legacy;
-use Loader;
+
/**
* @deprecated
*/
@@ -96,5 +96,4 @@ public function Delete() {
}
}
-
-}
+}
View
12 web/concrete/core/Legacy/TaskPermission.php
@@ -1,12 +1,14 @@
-<?
+<?php
+namespace Concrete\Core\Legacy;
+
/**
* @deprecated
*/
-
-final class TaskPermission extends Permissions {
+final class TaskPermission extends \Permissions {
public function getByHandle($handle) {
- $pk = PermissionKey::getByHandle($handle);
+ $pk = \PermissionKey::getByHandle($handle);
return $pk;
}
-}
+
+}
Something went wrong with that request. Please try again.