Changeset 2914:e4199034aa95

Timestamp:

01/12/15 11:32:24 (11 years ago)

Author:

Dsls

Branch:

twig

Message:

repaired admin.prepend.php, switch to latest twig version

Files:

• composer.json (modified) (1 diff)
• composer.lock (modified) (5 diffs)
• inc/admin/prepend.php (modified) (16 diffs)
• plugins/aboutConfig/_admin.php (modified) (2 diffs)

composer.json

@@ -1 +1 @@
 {
      "require": {
-          "twig/twig": "v1.15.0",
+          "twig/twig": "v1.16.3",
           "dotclear/clearbricks": "0.9.0"
      }

composer.lock

@@ -2 +2 @@
     "_readme": [
         "This file locks the dependencies of your project to a known state",
-        "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file"
+        "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
+        "This file is @generated automatically"
     ],
-    "hash": "0e1a745045996affedec510865a37f2d",
+    "hash": "c34c1a4718309acee66818ce4f8d919a",
     "packages": [
         {
@@ -42 +43 @@
         {
             "name": "twig/twig",
-            "version": "v1.15.0",
+            "version": "v1.16.3",
             "source": {
                 "type": "git",
-                "url": "https://github.com/fabpot/Twig.git",
-                "reference": "85e4ff98000157ff753d934b9f13659a953f5666"
+                "url": "https://github.com/twigphp/Twig.git",
+                "reference": "6dc11a1e8ecfc30e2c68aaeb218148409d8e68af"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/fabpot/Twig/zipball/85e4ff98000157ff753d934b9f13659a953f5666",
-                "reference": "85e4ff98000157ff753d934b9f13659a953f5666",
+                "url": "https://api.github.com/repos/twigphp/Twig/zipball/6dc11a1e8ecfc30e2c68aaeb218148409d8e68af",
+                "reference": "6dc11a1e8ecfc30e2c68aaeb218148409d8e68af",
                 "shasum": ""
             },
@@ -60 +61 @@
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.15-dev"
+                    "dev-master": "1.16-dev"
                 }
             },
@@ -83 +84 @@
                     "email": "armin.ronacher@active-4.com",
                     "role": "Project Founder"
+                },
+                {
+                    "name": "Twig Team",
+                    "homepage": "http://twig.sensiolabs.org/contributors",
+                    "role": "Contributors"
                 }
             ],
@@ -90 +96 @@
                 "templating"
             ],
-            "time": "2013-12-06 07:47:10"
+            "time": "2014-12-25 19:58:19"
         }
     ],
-    "packages-dev": [
-
-    ],
-    "aliases": [
-
-    ],
+    "packages-dev": [],
+    "aliases": [],
     "minimum-stability": "stable",
-    "stability-flags": [
-
-    ],
-    "platform": [
-
-    ],
-    "platform-dev": [
-
-    ]
+    "stability-flags": [],
+    "prefer-stable": false,
+    "prefer-lowest": false,
+    "platform": [],
+    "platform-dev": []
 }

inc/admin/prepend.php

@@ -24 +24 @@
 function dc_load_locales() {
      global $_lang, $core;
-     
+
      $_lang = $core->auth->getInfo('user_lang');
      $_lang = preg_match('/^[a-z]{2}(-[a-z]{2})?$/',$_lang) ? $_lang : 'en';
-     
+
      l10n::lang($_lang);
      if (l10n::set(dirname(__FILE__).'/../../locales/'.$_lang.'/date') === false && $_lang != 'en') {
@@ -40 +40 @@
 {
      global $core;
-     
+
      $core->auth->user_prefs->addWorkspace('interface');
      $user_ui_iconset = @$core->auth->user_prefs->interface->iconset;
      if (($user_ui_iconset) && ($img)) {
           $icon = false;
-          if ((preg_match('/^images\/menu\/(.+)$/',$img,$m)) || 
+          if ((preg_match('/^images\/menu\/(.+)$/',$img,$m)) ||
                (preg_match('/^index\.php\?pf=(.+)$/',$img,$m))) {
                if ($m[1]) {
@@ -73 +73 @@
      # We have session information in constants
      $_COOKIE[DC_SESSION_NAME] = DC_AUTH_SESS_ID;
-     
+
      if (!$core->auth->checkSession(DC_AUTH_SESS_UID)) {
           throw new Exception('Invalid session data.');
      }
-     
+
      # Check nonce from POST requests
      if (!empty($_POST))
@@ -85 +85 @@
           }
      }
-     
+
      if (empty($_SESSION['sess_blog_id'])) {
           throw new Exception('Permission denied.');
      }
-     
+
      # Loading locales
      dc_load_locales();
-     
+
      $core->setBlog($_SESSION['sess_blog_id']);
      if (!$core->blog->id) {
@@ -108 +108 @@
                $p[3] = '/';
                call_user_func_array('setcookie',$p);
-               
+
                http::redirect('auth.php');
           }
@@ -116 +116 @@
                ,20);
      }
-     
+
      # Check nonce from POST requests
      if (!empty($_POST))
@@ -127 +127 @@
           }
      }
-     
+
      if (!empty($_REQUEST['switchblog'])
      && $core->auth->getPermissions($_REQUEST['switchblog']) !== false)
@@ -138 +138 @@
                unset($_SESSION['media_manager_page']);
           }
-          
+
           # Removing switchblog from URL
           $redir = $_SERVER['REQUEST_URI'];
@@ -146 +146 @@
           exit;
      }
-     
+
      # Check blog to use and log out if no result
      if (isset($_SESSION['sess_blog_id']))
@@ -161 +161 @@
           }
      }
-     
+
      # Loading locales
      dc_load_locales();
-     
+
      if (isset($_SESSION['sess_blog_id'])) {
           $core->setBlog($_SESSION['sess_blog_id']);
@@ -172 +172 @@
      }
 }
+# Add admin default templates path
+$core->loadTemplateEnvironment();
+$core->tpl->getLoader()->addPath(dirname(__FILE__).'/default-templates');
+# Set admin context
+$_ctx = new dcAdminContext($core);
+$core->tpl->addExtension($_ctx);
 
 $core->adminurl = new dcAdminURL($core);
@@ -214 +220 @@
      }
      unset($f);
-     
+
      if (($hfiles = @scandir($locales_root.$_lang.'/help')) !== false)
      {
@@ -235 +241 @@
      # [] : Title, URL, small icon, large icon, permissions, id, class
      # NB : '*' in permissions means any, null means super admin only
-     
+
      # Menus creation
      $_menu = new ArrayObject();
@@ -254 +260 @@
 
      # Set menu titles
-     
+
      $_menu['System']->title = __('System settings');
      $_menu['Blog']->title = __('Blog');
@@ -275 +281 @@
      addMenuItem('Blog',__('New entry'),'admin.post','images/menu/edit.png',
           $core->auth->check('usage,contentadmin',$core->blog->id));
-     
+
      addMenuItem('System',__('Update'),'admin.update','images/menu/update.png',
           $core->auth->isSuperAdmin() && is_readable(DC_DIGESTS));
@@ -293 +299 @@
 }
 
-# Add admin default templates path
-$core->tpl->getLoader()->addPath(dirname(__FILE__).'/default-templates');
-# Set admin context
-$_ctx = new dcAdminContext($core);
-$core->tpl->addExtension($_ctx);
+
 
 # --BEHAVIOR-- adminPrepend

plugins/aboutConfig/_admin.php

@@ -11 +11 @@
 # -- END LICENSE BLOCK -----------------------------------------
 if (!defined('DC_CONTEXT_ADMIN')) { return; }
-
 $_menu['System']->addItem('about:config',
      $core->adminurl->get('admin.plugin.aboutConfig'),
@@ -18 +17 @@
           $core->auth->isSuperAdmin());
 
-$core->tpl->getLoader()->addPath(dirname(__FILE__).'/admtpl/','aboutConfig');
+$GLOBALS['core']->tpl->getLoader()->addPath(dirname(__FILE__).'/admtpl/','aboutConfig');